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)
first checkin of organization
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
rebasing
I have a lot of stats to work with
Merge branch 'feature/organization' of github.com:CityGenerator/Megacosm-Generator into feature/organization

Conflicts:
	megacosm.py
rebasing
I have a lot of stats to work with
Merge branch 'feature/organization' of github.com:CityGenerator/Megacosm-Generator into feature/organization
merged
I have a lot of stats to work with
fixing inconsistencies
Merge branch 'feature/organization' of github.com:CityGenerator/Megacosm-Generator into feature/organization

Conflicts:
	data/organization.data