Updated mainwindow.cpp to reflect UI changes made by Franck
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Yet even more UI goodness
Semi-complete parameterization of flame function