commit
Merge branch 'master' of https://github.com/ngordon17/DukeRayTracer

Conflicts:
	.DS_Store
	DerivedData/DukeRayTracer/Build/Intermediates/DukeRayTracer.build/Debug/DukeRayTracer.build/DukeRayTracer-project-headers.hmap
	DerivedData/DukeRayTracer/Build/Intermediates/DukeRayTracer.build/Debug/DukeRayTracer.build/DukeRayTracer.hmap
	DerivedData/DukeRayTracer/Index/Debug/macosx10.9-x86_64/DukeRayTracer.xcindex/db.xcindexdb
	DerivedData/DukeRayTracer/Index/Debug/macosx10.9-x86_64/DukeRayTracer.xcindex/db.xcindexdb-shm
	DerivedData/DukeRayTracer/Index/Debug/macosx10.9-x86_64/DukeRayTracer.xcindex/db.xcindexdb-wal
	DerivedData/DukeRayTracer/Logs/Build/Cache.db
	DerivedData/DukeRayTracer/Logs/Debug/Cache.db
	DerivedData/DukeRayTracer/TextIndex/text-index.idx