created building object, inn object, shop object, and shop_factory file
Remove gremlin code
updated after gremlin cleanup
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
Merge branch 'chris-branch' of https://github.com/jladdjr/lord-of-the-rings into chris-branch
Merge branch 'chris-branch' into temp

Conflicts:
	game_loader.py
	test.py