completely built game 2
Merge branch 'MakingGame2'

Merging in the completed game 2 file. .
fixed merge conflicts