i have no clue what I did but I think it was good
resolved merge conflicts
updated the UI and added the specific beer/drink names
resolving merge conflicts yet again