add .gitignore
Merge branch 'origin/master'