Added ray-disk intersection and material definition.

Makefile

@@ -1,6 +1,6 @@
 TARGET = ray
-HEADERS = ray.hpp figure.hpp sphere.hpp plane.hpp light.hpp tracer.hpp
-OBJECTS = main.o sphere.o plane.o tracer.o
+HEADERS = ray.hpp figure.hpp sphere.hpp plane.hpp disk.hpp material.hpp light.hpp tracer.hpp 
+OBJECTS = main.o sphere.o plane.o disk.o tracer.o
 CXX = g++
 CXXFLAGS = -ansi -pedantic -Wall -g -DGLM_FORCE_RADIANS -fopenmp
 LDLIBS = -lm
@@ -17,6 +17,8 @@ sphere.o: sphere.cpp $(HEADERS)
 
 plane.o: plane.cpp $(HEADERS)
 
+disk.o: disk.cpp $(HEADERS)
+
 tracer.o: tracer.cpp $(HEADERS)
 
 .PHONY: clean