Updating main game skeleton
Merge remote-tracking branch 'origin/master' into testMainLogic
Readding character controller for debugging
Merge branch 'testMainLogic'