Combine gamesetup and game classes
Merge pull request #1 from tarynsauer/experimental

Combine gamesetup and game classes