stable build, looking good as far as phong and diffuse
Merge branch 'master' of https://github.com/gitNate/CS

Conflicts:
	455/RayTracer/RayTracer/Definitions.h
	455/RayTracer/RayTracer/Main.cpp
	455/RayTracer/RayTracer/Object.cpp
	455/RayTracer/RayTracer/Object.h
	455/RayTracer/RayTracer/RayTracer.cpp
	455/RayTracer/RayTracer/Sphere.cpp
	455/RayTracer/RayTracer/Sphere.h
	455/RayTracer/RayTracer/Triangle.cpp
	455/RayTracer/RayTracer/Triangle.h
	455/RayTracer/RayTracer/Vector.h