Update .gitignore
Merge branch 'dev'