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
Cleaned up some of the mess in the merge
Changed the player size to better match the sprite