temp
Merge branch 'master' of github.com:pathfinder1989/KKDemo

Conflicts:
	KKDemo/KKDemo.xcodeproj/project.pbxproj
	KKDemo/KKDemo.xcodeproj/project.xcworkspace/xcuserdata/Meishi.xcuserdatad/UserInterfaceState.xcuserstate
	KKDemo/KKDemo/Macro/KMacro.h