updated buildings
added population simulation. Errybuddyhumps!
Merge github/master