Updated drink menu
Resolved barbot.json merge conflict