still working on shaders for lighting
Merge branch 'master' of https://github.com/lygood2007/final_pro_cs224

Conflicts:
	final_qt/support/glwidget.cpp