start testing (failing)
Merge pull request #9 from louridas/master

start testing (failing)
Merge branch 'master' into mongodb

Conflicts:
	package.json