I hate collision
Merge branch 'collision' of https://github.com/MAVG-Programmers/LudumDare31 into collision