GameSetup was not saved when merged, saved
popup done
Merge branch 'master' of github.com:emilyreinhold/StatThat