Merge branch 'master' of https://github.com/MrHalfman/ld26

Conflicts:
	js/entities.js
	js/game.js