Merge pull request #3 from KevinBlom/master

update Kevin to Master
Testing the branch
Cleaned up Game and added Javadoc
Merge pull request #4 from KevinBlom/Kevin

Merge Game.java. Has been cleaned and added Javadoc