//comments
//comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	Summary.md
Merge branch 'master' of https://github.com/UGroup/ScrumblerBook