Adjustments
Merge branch 'master' of https://github.com/adam-tibbetts/santino-s-grand-adventure

Conflicts:
	src/game.js
Comment fixes