添加了注释...
Merge branch 'master' of https://github.com/luowei/oc-hello

Conflicts:
	HelloWorld.xcodeproj/project.xcworkspace/xcuserdata/luowei.xcuserdatad/UserInterfaceState.xcuserstate