Merge remote-tracking branch 'github/master' into loadingObj
Obj now support normals
Merge branch 'ambiant+diffuseLighting' into loadingObj
Added higher-res mesh