Merge branch 'master' of github.com:AI-comp/GameEngineLab

Conflicts:
	game.html
	game.js