重新提交
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
删除.gitignore文件