Merge branch 'develop' of https://github.com/nathanmyles/BearAttack into develop

Conflicts:
	js/game.js