added a node_module folder on request but should be removed ASAP
bug fixes and change from bcrypt to bcrypt-nodejs
added specific node version to package.json
syntax fix
added npm dependency
package.json change
Merge branch 'master' into georgedev

Conflicts:
	.travis.yml