light,material, ray tracer
Merge branch 'master' of https://github.com/jingjingwang/557-ray

Conflicts:
	src/RayTracer.cpp