update settings
Merge branch 'master' of https://github.com/marcos-pereira/ees-projekt