Implemented nicest error message ever! Also improved collision detection
Merge remote-tracking branch 'origin/gamelogic-sprint3' into gui-sprint3