add ignore
Merge branch 'master'

Conflicts:
.gitignore
Merge branch 'master'