QOL changes mostly
Merge branch 'master' of git://github.com/eibakke/drinking-app

Conflicts:
MainStoryboard.storyboard
trying to overcome merge errors