commit ignore
ignore
delete ignore file
delete ignore file
merge branch and push local changes
删除无用代码，修改细节
修改细节
修改细节
Merge remote-tracking branch 'origin/master'