commit
Merge branch 'master' of https://github.com/ngordon17/DukeRayTracer
add gitignore
Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/ngordon17/DukeRayTracer
merge