Fixing the game back to the proper state
Merge branch 'master' of
https://github.com/duke-compsci308-spring2013/vooga