resync
Merge branch 'master' of https://github.com/xurui203/CaptainCopyCat

Conflicts:

CCC.xcodeproj/project.xcworkspace/xcuserdata/XuRui.xcuserdatad/UserInter
faceState.xcuserstate