Update Settings
Merge branch 'master' of github.com:mortik/dot-files