StateManager

Completed StateManager
StateManager Merge

Merging the StateManager branch with master
Moved MapGen/Map to GameState

Moved new MapGenerator and Map out of main and into the GameState class.