Fixed the collission prevention
Merge branch 'master' of github.com:torthefurious/Assignment3_Grail