Added material parsing
Added table
Merge branch 'jhqt' of https://github.com/UMLComputerGraphics/GraphicsProject into jhqt

it merges an updated upstream into a topic branch.

I don't know what I'm doing