Lighting system partially implemented, need generilization
Merge remote-tracking branch 'origin/master' into lighting

Conflicts:
	Game.cpp
	Game.h
	GameLoop.cpp
	Player.h
	VWProj3.vcxproj
	VWProj3.vcxproj.filters
Merge branch 'master' into lighting

Conflicts:
	Game.cpp
	VWProj3.vcxproj
Lighting demo done
Merge remote-tracking branch 'origin/master' into lighting

Conflicts:
	Game.cpp
	GameLoop.cpp
Final demo
stuff