Merge pull request #161 from CityGenerator/develop

update res gen
Test
un test.
Merge branch 'feature/ResourceGenerator' of github.com:CityGenerator/CityGenerator into feature/ResourceGenerator
New files for Resource generation.
Merge branch 'hotfix/v2.1.1' into develop
Framed out the narrative for resources.
Mostly code comeplete.  Still need to integrate into the application.
Merge branch 'feature/MagicItemGenerator' into develop
Spent my lunch formatting regexes... I am lame.
committing last night's changes that were stashed
committing legends file from stash
garbage from a bad stash
Merge branch 'develop' feature/npc-experience_50

all better

Conflicts:
	xml/npcs.xml
Merge branch 'feature/npc-experience_50' into develop
fixed some bugs and tests with flag.
more condensing
new readme to resolve #160
Fix for readme
Problem calling my generator.