no message
Merge branch 'master' of https://github.com/TlanguateOranization/MyShow

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