corrected typo: setScale is now fromScaling in mat2
Merge branch 'master' of https://github.com/drdeath863/gl-matrix