working on collisions
Merge branch 'master' of https://github.com/m0pt0pmatt/GameJamFall2013
things