pinholeCamera, diffuse
Merge branch 'master' of https://github.com/hanton/pyRayTracer

Conflicts:
	.ShadingPoint.py.swp
	Scene.pyc
	Shape.pyc
	Utility.pyc
	ViewPlane.pyc
delete pyc