mod gitignore
Merge branch 'master' of github.com:jxniebo/overseas.master