fixed collisions for now
Merge branch 'master' of https://github.com/m0pt0pmatt/GameJamFall2013