Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/mareofnight/Megacosm-Generator into develop
Merge branch 'develop' of https://github.com/CityGenerator/Megacosm-Generator into develop

Conflicts:
	data/npc.data
Merge branch 'multiflag' into develop
fixed a mistake I made merging data/npc.data
added logging to everything
removed print statements
cleaned up imports
Merge branch 'feature/removeprints' into develop
fix for logging
whoops
expand mundane item list #78

added 160 mundane items and changed the alphabetical order to have a
space come before a number or letter. Example: “battlehammer” comes
after “battle pennant”.
remove Noise from requirements.txt
Merge pull request #99 from noobur/develop

Issue #78 fix and requirements.txt change
fixed typo
Merge pull request #100 from noobur/develop

fixed typo
Resolved #101, removed logger from json
Merge branch 'develop' of github.com:CityGenerator/Megacosm-Generator into develop
First go at refactoring logging stuff
Merge branch 'feature/log-reconfigure' into develop

This fixes some logging issues (I hope)