semi working drink views
Merge branch 'master' of https://github.com/megu5202/iDrink