npm run test is running delete dbs, setuptestdbs and mocha tests
Merge branch 'master' of https://github.com/cprasenj/ADDA
ignoring npm-debug.log
Merge branch 'master' of https://github.com/cprasenj/ADDA

Conflicts:
	package.json
	tests/JsSqlTest.js