collision detection initial commit
Merge pull request #23 from mjbradford89/master

collision detection initial commit