progress
Merge branch 'master' of git://github.com/Macri-man/Shading-Example
merging
rts