commit to pull
Merge branch 'master' of https://github.com/eibakke/drinking-app

Just a merge to pull
changed editsettingsviewcontroller to only update userdefaults when info is updated