update .gitignore file
Merge branch 'work'