collision done
Merge branch 'master' of https://github.com/OnurIltan/320GroupProject