CM drink activity
Merge branch 'master' of https://github.com/AlexRoscoe/Tipple