modified:   Camera.cpp
	modified:   Camera.h
	modified:   Color.cpp
	modified:   Light.h
	modified:   List.cpp
	modified:   Makefile
	modified:   Material.cpp
	modified:   Material.h
	modified:   Node.cpp
	modified:   Parser.cpp
	modified:   Parser.h
	modified:   RayTracer.cpp
	modified:   RayTracer.h
	deleted:    SceneBuilder.cpp
	deleted:    SceneBuilder.h
	modified:   Shape.h
	deleted:    Skeleton.obj
	modified:   String.cpp
	modified:   Vector.cpp
	deleted:    camera.txt
	deleted:    config/camera.txt
	deleted:    config/scene.txt
	modified:   images/out.png
	modified:   main.cpp
	deleted:    rayTracer.h
	deleted:    unitest/main.cpp~
Merge branch 'master' of https://github.com/TrevInc/4050raytracer