Consistency, Warnings
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Autoformatting gone awry
Merging with Franck
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject