Merge pull request #1 from huangfe1/master

黄飞
Merge pull request #2 from huangfe1/master

黄飞修改的
Merge pull request #3 from huangfe1/master

我又改了几个地方
delete all
Revert "delete all"

This reverts commit 2cb6de5e9a71af3439ae808ae946476058b02c51.
Merge pull request #1 from zhang520/master

？？