Update gitignore
Merge branch "master"