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.
adding regrets
new seeds avaiable
added new city stats

resolved #108
resolved #167
resolved #166
resolved #54
implemented #174 for establishmentgenerator
for #174 on generate_stats (and select_features)
Merge branch 'feature/generate_stats' into develop
resolves #159
stubs for weapons, armor and potions
basic generator is in place...
resolving #129 for the maagic item generator
Merge branch 'feature/MagicItemGenerator' into develop
Spent my lunch formatting regexes... I am lame.