implemented all gamestate functions, filled implementation of masterController classes, etc
fixing gameModelController conflicts