keeping only one light for testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	TEXTURE_FILES/DSCN9931.ppm