added meshes, renamed Shader to lowercase
Merge remote-tracking branch 'origin/master'