City.poulation and Country.population added
Merge branch 'master' of https://github.com/friday11/Playground.git

Conflicts:
	GitTest/src/gittest/Country.java
Cleanup