Made changes to roundprogressview
merge conflict resolved
Merge branch 'master' of https://github.com/eibakke/drinking-app

This merge is very necessary