My server config
23 player game
Merge branch 'master' into devin-april7-2
Merge conflicts
Merge pull request #142 from devinlynch/devin-april7-2

Devin april7 2