added collision
Merge branch 'master' of https://github.com/JamiesonWarner/gamejam