Started to outline the collision detection model

^this^
Fixed the implementation of collision detection

works now!
Merge pull request #3 from MaddawgX9/collision-detection-(broken)

Collision detection (broken)