* obb
Merge branch 'master' of https://github.com/pboechat/simpleraytracer

Conflicts:
	simpleraytracer.vcxproj.filters