更改了.gitignore
fixed confict
debug
Merge branch 'master' into develop