update
new scene
Merge branch 'master' of github.com:bgotink/pbrt-v2

Conflicts:
	src/accelerators/shaft/shaftaccel.cpp