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