func
Merge branch 'master' of https://github.com/iceesj/csjLoveSwift

Conflicts:

csjLoveSwift.xcodeproj/project.xcworkspace/xcuserdata/zhicheng.xcuserdat
ad/UserInterfaceState.xcuserstate