Working on editing drinks
Merging changes from master
Fixed editing of drinks.
merge conflicts
Merge pull request #5 from Pwalker86/Pwalker86-phil/editing_drinks

Pwalker86 phil/editing drinks