add .settings
Merge branch 'update-gitignore'