trying to fix errors
"canMerge branch 'master' of https://github.com/StephenJayYoung/CityHacker

Conflicts:
	test/server/user_tests.js
fixed all the things