All pages complete.
Merge branch 'master' of https://github.com/jthg/coms4111

Conflicts:
	project1/proj1web/WebContent/index.html
	project1/proj1web/WebContent/script/userGame.js