Added description and instock for drinks
Fixed a merge