Fixes bug where only one player will be in team 1 consistently
Merge branch 'master' of https://github.com/alvinlao/charm