added collision detection
Merge branch 'master' of https://github.com/teamsnowman/wastedtime