collision detection
Merge branch 'master' of https://github.com/cloudarts/twoapart
changed parser