update game.js
Merge branch 'master' of https://github.com/galuszkak/gamedevjs

Conflicts:
	js/game.js