Collision work
Merge branch 'master' of https://github.com/groupB-game/SPGame.git