update .gitignore file
merge from origin/dev