fixed tab colors and tests
Merge branch 'master' of https://github.com/StephenJayYoung/CityHacker