Game 6 and 7
Merge branch 'master' of https://github.com/ctmartinez1992/HTML5Quest

Conflicts:
	game6/index.html
	game6/js/Game.js