mergee confliiiicts
Merge branch 'master' of https://github.com/radiolarian/game

Conflicts:
	js/entities/entities.js
	js/game.js
	js/resources.js
	js/screens/play.js