Collision fixed
Merge branch 'master' of https://github.com/danielfilho/firefoxos-game-hack