a
Merge branch 'master' of https://github.com/manuqiao/ObjC_Design_Pattern

Conflicts:

ObjC_Design_Pattern.xcodeproj/project.xcworkspace/xcuserdata/manuqiao.xc
userdatad/UserInterfaceState.xcuserstate