Merge branch 'gh-pages' of https://github.com/Michael-Bell/Phased-Game into gh-pages

Conflicts:
	js/main.js