update .gitignore
Merge branch 'chin'