Merge pull request #7 from thijser/feature-geometry_intersection

Fixes for complex object
Q
Merge branch 'master' of https://github.com/thijser/Computer-Graphics-raytracing
Added textured spheres
Lot's of nice stuff
Merge branch 'refs/heads/master' into feature-bounding_box_collision

Conflicts:
	backward_shading.cpp
	initialize.h
Now allowing you to have differing viewport and render size.