updated players to belong to SetupState
Merge branch 'master' of https://github.com/chrishoage/bump