Improved collision system

Collision system now allows movement in 3 directions while colliding
rather than 2 with the previous system