Homework 6 Updates
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	(DISABLED)game.appcache
	game.html