made a better collision controller
Merge pull request #26 from brad-haan/collision-controller

collision controller