pre-merge commit
Merge branch 'master' of https://github.com/nsipid/ludum26

Conflicts:
	js/game.js
collisions