Merge pull request #10 from mko237/master

Collision Detection
More Collision Stuff
Merge pull request #13 from Crysco/master

more collision stuff