modify

modify
Merge branch 'master' of https://github.com/zzltjnh/ZLImageCrop

Conflicts:

ZLImageCrop.xcodeproj/project.xcworkspace/xcshareddata/ZLImageCrop.xcche
ckout