Collisions work going up and left into upper left wall
Merge conflict fix
Merge branch 'master' of github.com:Uni-Kitty/project3