Collision detection
Merge branch 'master' of https://github.com/ninjascribble/LudumDare-29