basic collisions
Merge branch 'master' of https://github.com/wsmind/dont-play-with-me