Added some basic collision detection
Merge branch 'master' of https://github.com/CarlWSummers/Distim.git