asdf
Merge branch 'master' of github.com:polygoncz/raytracer

Conflicts:
	src/core/scene.cpp