change state to GameState to fit naming scheme
Merge remote-tracking branch 'origin/master'