Merge branch 'master' of https://github.com/plane000/note-service-server

package.json

@@ -4,6 +4,7 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
+    "bcrypt": "^3.0.0",
     "body-parser": "^1.18.3",
     "colors": "^1.3.1",
     "express": "^4.16.3",

src/controllers/user.js

@@ -1,3 +1,5 @@
+import bcrypt from 'bcrypt';
+
 import {Logger} from '../models/logger';
 import {ControllerHandler} from './controllerHandler';
 import {API} from '../models/api/api';