updates
Merge branch 'master' of github.com:neneboe/nicks-math-editor