Fix collisions
Merge branch 'master' of https://github.com/groep10/game