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

merge
Merge branch 'master' of https://github.com/eibakke/drinking-app

merge