3rd upload

Lighting works now with normal maps and two different light types.