sending up the collision methods
merging with group
committing everything i have
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git