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