collision handling
Merge branch 'master' of https://github.com/fryingpan/Assignment2