wangzhen maps
Merge branch 'master' of github.com:yanxin59/tranckFighting

Conflicts:
	Classes/AppDelegate.cpp
	Classes/ControllerLayer.cpp
	Classes/ControllerLayer.h
	Classes/Enemy.cpp
	Classes/GameScene.cpp
	Classes/GameScene.h
	Classes/tanks.cpp
	Classes/tanks.h
wangzhen change file
Merge branch 'master' of github.com:yanxin59/tranckFighting