Merge branch 'master' of https://github.com/yaodd/MMFIighting

Conflicts:
	MMFighting.xcodeproj/project.pbxproj
	MMFighting/EnemySprite.cpp
	MMFighting/EnemySprite.h
	MMFighting/GameLayer.cpp
	MMFighting/GameLayer.h
	MMFighting/PlayerSprite.cpp
	MMFighting/PlayerSprite.h

Signed-off-by: yaodd <yaodunding2006@163.com>
Merge branch 'master' of https://github.com/yaodd/MMFIighting

Conflicts:
	MMFighting/EnemySprite.cpp
	MMFighting/GameLayer.cpp
	MMFighting/PlayerSprite.cpp

Signed-off-by: yaodd <yaodunding2006@163.com>