我操的类
Merge branches 'master' and 'master' of https://github.com/TlanguateOranization/MyShow

Conflicts:
	myshow/MyShow.xcodeproj/project.xcworkspace/xcuserdata/issuser.xcuserdatad/UserInterfaceState.xcuserstate
呵呵的
Merge branch 'master' of https://github.com/TlanguateOranization/MyShow

Conflicts:
	myshow/MyShow.xcodeproj/project.pbxproj
	myshow/MyShow.xcodeproj/project.xcworkspace/xcuserdata/issuser.xcuserdatad/UserInterfaceState.xcuserstate