update readme
Merge branch 'master' into add-normals-and-lighting