Better flicker
Merge branch 'master' of github.com:UMLComputerGraphics/GraphicsProject