setting up server tests
Merge branch 'master' of https://github.com/StephenJayYoung/CityHacker
setting up server tests