Added mocha to the package.json dependencies and merged branch 'master' of github.com:elycruz/sjljs
Merge branch 'master' of github.com:elycruz/sjljs