lihting 3
Merge branch 'master' of https://github.com/Anexen/learnOpenGL

Conflicts:
	Catapult3D/Flower.cs