added total population
fixed merge conflicts
Merge pull request #21 from sgray11/total_population

added total population