first commit
Merge branch 'master' of https://github.com/jenseh/path-tracer.git

Conflicts:
	main.cpp