Shadows are now working! Upgraded shaders to use model 1.3
Resolved merge conflict