finish 3-2-2
Merge branch 'master' of github.com:iTyran/CocoSudio