add to .gitignore
Merge branch 'master'