Adding shape classes
Pulling changes
Merge branch 'master' of https://github.com/bjrafeld/RayTracer

Conflicts:
	SupportClasses.cpp
	SupportClasses.h
Pulling

Merge branch 'master' of https://github.com/bjrafeld/RayTracer

Conflicts:
	SupportClasses.cpp
	SupportClasses.h
Adding Shape, Sphere, Triangle classes