Chris1

Chris 1 Fix
Merge remote-tracking branch 'origin/Chris1' into Travis2

Conflicts:
	GitLab_Group2_Document.html