Minor Changes
Merge branch 'master' of https://github.com/CBSAdvisor/cbs-quantum

Conflicts:
	Documents/game of thrones ascent.txt