Merge branch 'master' into develop
Added ability to mark beers as being off
Working on getting the beers off option working
Tidied
Merge branch 'add_drunk_option' into develop
Merge branch 'develop'
Bumped version