Merge pull request #1 from abrahamian/master

refactored game master test and code