fertig fast
Merge branch 'master' of https://github.com/pansit/Raytracer-I-Files

Conflicts:
	Material.cpp
	Material.hpp