QT dicking-with
Merge branch 'master' of github.com:UMLComputerGraphics/GraphicsProject
Merge branch 'master' of github.com:UMLComputerGraphics/GraphicsProject
Make colors more sane