City.toString changed, Continent enum changed
Merge branch 'master' of https://github.com/friday11/Playground.git

Conflicts:
	GitTest/src/gittest/Continent.java