added a nice error message for when you forget to add a uniform
Merge remote-tracking branch 'origin/master'