project cleanup and improved collision detection
Merge branch 'master' of https://github.com/alexandrovsky/bad_trip