Update gitignore
Merge branch master branch
Merge branch master