Merge branch 'feature-triagle_collision' of https://github.com/thijser/Computer-Graphics-raytracing into feature-triangle_collision

Conflicts:
	a.out
Merge branch 'master' of https://github.com/thijser/Computer-Graphics-raytracing into feature-triangle_collision
Merge branch 'feature-triagle_collision' of https://github.com/thijser/Computer-Graphics-raytracing into feature-triangle_collision

Conflicts:
	a.out
And let's hope a.out stays away now