finished collision detector
Merge branch 'master' of https://github.com/zergx1/mario.git