添加.gitignore
merge from upstream