Fixed *ALL* the collision code!
Merge branch 'master' of https://github.com/claudyaj1/Games3Project2