adding in-town/out-of-town sites
Merge branch 'master' of github.com:mhmurray/gloryhole

Conflicts:
	gamestate.py
	gtr.py
	gtrutils.py
Merge branch 'master' of github.com:mhmurray/gloryhole