making GameState play well with others
making GameState play well with others
resolving merge conflict
Merge branch 'master' of https://github.com/chungs1/HackStanford