Game finished

Please review this branch. It includes the changes in the prior pull requests