Collision fix
Merge branch 'GameMechanic' of https://github.com/LittleFinix/MLP_Platformer into GameMechanic