Commits to help parse out what the &#34 is...
More flag flailing

Leftovers from last night's failed flag attempt. checking it in in hopes that matt can salvage it.
Need to recreate all of these...
Commits to help parse out what the &#34 is...
More flag flailing

Leftovers from last night's failed flag attempt. checking it in in hopes that matt can salvage it.
Merge branch 'feature/flags' of github.com:CityGenerator/Megacosm-Generator into feature/flags

Conflicts:
	megacosm.py

fixing fugly stuff (I hope)
basic leader data...
first checkin of organization
checking in street data
first checkin of organization
Merge branch 'feature/organization' of github.com:CityGenerator/Megacosm-Generator into feature/organization
I have a lot of stats to work with
new help button
checking in street data
Merge branch 'feature/street' of github.com:CityGenerator/Megacosm-Generator into feature/street
new street data and details
refactored tests and added new route tests
new help button
Merge branch 'feature/openhatchintegration' of github.com:CityGenerator/Megacosm-Generator into feature/openhatchintegration
Merge branch 'feature/openhatchintegration' into develop