M1 one ship in one group
Merge branch 'master' of github.com:shilinf/381_6
finish M2