final version of the game
Merge branch 'master' of https://github.com/nmhall/project