Collisions better, still occasional bugs and corner error.
Merge branch 'master' of https://github.com/continnd/CSE386FinalProject