Introducing shininess to material
Merge branch 'master' of https://github.com/kovacsv/RayTracer
Merge branch 'master' into UserInterface

Conflicts:
	source/commandline/main.cpp