Merge pull request #28 from wcjohnson11/group-server

Group server