collision detection completed
Merge branch 'master' of github.com:TeamMarcelProust/GameOOP