Merge pull request #83 from nolanfilter/Nolan

Added room game state logic