file clean up
Merge branch 'master' of https://github.com/eibakke/drinking-app

pull to help leo
file clean up