Work on cities
Merge branch 'chris-branch' of github.com:jladdjr/lord-of-the-rings into chris-branch

Conflicts:
	cities/building.py
	cities/inn.py