c
Merge branch 'master' of https://github.com/lixiaolei19821218/TinyPix

Conflicts:

TinyPix.xcodeproj/project.xcworkspace/xcuserdata/lixiaolei.xcuserdatad/U
serInterfaceState.xcuserstate