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