更新
更新
Merge branch 'master' of github.com:macroth/touchCrop
Merge pull request #12 from macroth/master

Auto merge by kpm server