Add city scene

Add city scene
Merge branch 'master' of https://github.com/wsbjwjt/TanksWar

Conflicts:
	Classes/CityScene.h
	Classes/Tank.cpp