Started work on the Collision Manager
Player can no longer go out of bounds
Started work on terrain collision
Fucked up the merge, This is the merge commit