forgot
this too
Merge branch 'master' of https://github.com/sturmE/raytracer

Conflicts:
	src/Cornell Box.xml
	src/app.cpp
	src/raytracer.cpp
stupid api