首页的上来和下来我认为撸完了
Merge branches 'master' and 'master' of https://github.com/TlanguateOranization/MyShow

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