minor changes
added phong and gouraud shading
Merge branch 'master' into shadingAndLighting
minor changes

problems with undo merge