Merge pull request #1 from 3qilabs/staging

Staging
make bootcamp feature files a bit more consistent
session one doc update
Merge branch 'master' into staging

Conflicts:
	documentation/Session_One_0_1.docx