merge
Merge branch 'master' of https://github.com/paulmakl/CS315-Final
vastly improved collision code