Update gitignore file
Merge branch 'ignore'