Volume controls integrated into UI
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Fixed an oops