going to pull jacobs changes to Game
merging in some of jacob's work
Merge branch 'master' of https://github.com/isaiahmathieu/pocketpickup
the first test runs correctly
fixed merge conflict