Merge "docs: add userguide" tags/colorado.1.0 colorado.1.0
authorMaryam Tahhan <maryam.tahhan@intel.com>
Sun, 14 Aug 2016 12:03:24 +0000 (12:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sun, 14 Aug 2016 12:03:24 +0000 (12:03 +0000)

Trivial merge