Fixed collision resolution issues
Merge branch 'master' of https://github.com/st3w/CIS4914