Mconti1527/materials mconti material overhaul v2

Marston requested to merge
mconti1527/materials:mconti1527/materials-mconti-material-overhaul_v2 into master

Redid this with git ssh to get around web ide bug that was causing a bunch of the pictures to mess up

Merge request reports