diffuse Working
Merge branch 'Lab-6-Working' of https://github.com/smcvei200/GP2BaseCode into Lab-6-Working

Conflicts:
	GP2BaseCode/D3D10Renderer/D3D10Renderer.cpp
	GP2BaseCode/D3D10Renderer/D3D10Renderer.h

Updated