adding shots and beer and cocktail percentages and names
fixing merge conflicts