m

m
test

 test
test

test
Merge branch 'dev' of https://github.com/chaucyzhang/emblemKnight into dev

Conflicts:

emblemKnight.xcodeproj/project.xcworkspace/xcuserdata/administrator.xcus
erdatad/UserInterfaceState.xcuserstate
	emblemKnight/Classes/IntroScene.m