messed up collision
Merge branch 'master' of https://github.com/JumpWar/glowing-octo-ninja