so much stuff
merge conflicts
comments
Merge branch 'scene-manager' into game-manager
Game Manager