light fix - i think it works fine now
Merge branch 'hw3-main' of https://github.com/bedoron/ComputerGraphics into hw3-main

Conflicts:
	CG_skel_w_MFC/MarbleFshader.glsl
	CG_skel_w_MFC/Scene.cpp