最后2条没有做到，惭愧，还得努力啊
delete it
Merge branch 'master' of https://github.com/xcaptain/plane_fight

合并2次提交