Test
testing git
test2
test
Merge branch 'master' of https://github.com/padentomasello/raytracer

Conflicts:
	scene.cpp
Revert 2ab131c..cc7f176

This rolls back to commit 2ab131cfffa9986461d6096fa42128c88383f204.
github test