Fixed some warnings
Merge branch 'master' into JesseMOE
Test.
Undo test.
Fixed errors and warnings.
Added shading.
Merge remote-tracking branch 'origin/master' into landonMOE
started adding terrain setup