Changed liquor model to be based on wine bottle geometry
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject