Cities, inn, money, and enter command
worked a little on shop
Batch update - cities, shop, money, inn
Revert "Batch update - cities, shop, money, inn"

This reverts commit d61722b806e340f1c5af3abafe6626f958003ea7.
Batch update - cities, shop, money, inn
Merge branch 'chris-branch' of github.com:jladdjr/lord-of-the-rings into chris-branch

Conflicts:
	cities/inn.py
	factories/shop_factory.py
	game_loader.py
Code now represents what Chris had on his flash drive.
Overwrote Dmitriy's files with Chris files.
Merge branch 'chris-branch' into dmitriy-branch