Fix merge conflicts

Author: pierreTklein

package-lock.json

@@ -1,51 +1,51 @@
 {
-  "name": "hackboard",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "start": "NODE_ENV=deployment node ./bin/www.js",
-    "debug": "DEBUG=hackboard:* NODE_ENV=deployment nodemon --ignore gcp_creds.json ./bin/www.js",
-    "development": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",
-    "test": "DEBUG=hackboard:* NODE_ENV=test mocha --reporter spec tests/**.js --exit",
-    "seed": "NODE_ENV=development node ./seed/index.js",
-    "docs": "apidoc -i ./routes -o ./docs/api/"
-  },
-  "dependencies": {
-    "@google-cloud/logging-winston": "^0.9.0",
-    "@google-cloud/storage": "^2.3.0",
-    "@sendgrid/mail": "^6.3.1",
-    "bcrypt": "^3.0.0",
-    "cookie-parser": "~1.4.3",
-    "cookie-session": "^2.0.0-beta.3",
-    "cors": "^2.8.5",
-    "cryptiles": "^4.1.3",
-    "debug": "~2.6.9",
-    "dotenv": "^6.2.0",
-    "express": "~4.16.0",
-    "express-validator": "^5.3.1",
-    "express-winston": "^2.6.0",
-    "handlebars": "^4.0.12",
-    "jsonwebtoken": "^8.1.0",
-    "memory-cache": "^0.2.0",
-    "mongoose": "^5.4.2",
-    "multer": "^1.3.1",
-    "passport": "^0.4.0",
-    "passport-local": "^1.0.0",
-    "q": "^1.5.1",
-    "winston": "^2.4.4"
-  },
-  "devDependencies": {
-    "@types/express": "^4.11.1",
-    "@types/google-cloud__storage": "^1.7.2",
-    "@types/mongodb": "^3.1.18",
-    "@types/mongoose": "^5.3.7",
-    "@types/multer": "^1.3.7",
-    "apidoc": "^0.17.7",
-    "chai-http": "^4.2.1",
-    "chai": "^4.2.0",
-    "jshint": "^2.9.7",
-    "jslint": "^0.12.0",
-    "mocha": "^5.2.0",
-    "nodemon": "^1.17.3"
-  }
+    "name": "hackboard",
+    "version": "0.0.0",
+    "private": true,
+    "scripts": {
+        "start": "NODE_ENV=deployment node ./bin/www.js",
+        "debug": "DEBUG=hackboard:* NODE_ENV=deployment nodemon --ignore gcp_creds.json ./bin/www.js",
+        "development": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",
+        "test": "DEBUG=hackboard:* NODE_ENV=test mocha --reporter spec tests/**.js --exit",
+        "seed": "NODE_ENV=development node ./seed/index.js",
+        "docs": "apidoc -i ./routes -o ./docs/api/"
+    },
+    "dependencies": {
+        "@google-cloud/logging-winston": "^0.9.0",
+        "@google-cloud/storage": "^2.3.0",
+        "@sendgrid/mail": "^6.3.1",
+        "bcrypt": "^3.0.0",
+        "cookie-parser": "~1.4.3",
+        "cookie-session": "^2.0.0-beta.3",
+        "cors": "^2.8.5",
+        "cryptiles": "^4.1.3",
+        "debug": "~2.6.9",
+        "dotenv": "^6.2.0",
+        "express": "~4.16.0",
+        "express-validator": "^5.3.1",
+        "express-winston": "^2.6.0",
+        "handlebars": "^4.0.12",
+        "jsonwebtoken": "^8.1.0",
+        "memory-cache": "^0.2.0",
+        "mongoose": "^5.4.2",
+        "multer": "^1.3.1",
+        "passport": "^0.4.0",
+        "passport-local": "^1.0.0",
+        "q": "^1.5.1",
+        "winston": "^2.4.4"
+    },
+    "devDependencies": {
+        "@types/express": "^4.11.1",
+        "@types/google-cloud__storage": "^1.7.2",
+        "@types/mongodb": "^3.1.18",
+        "@types/mongoose": "^5.3.7",
+        "@types/multer": "^1.3.7",
+        "apidoc": "^0.17.7",
+        "chai-http": "^4.2.1",
+        "chai": "^4.2.0",
+        "jshint": "^2.9.7",
+        "jslint": "^0.12.0",
+        "mocha": "^5.2.0",
+        "nodemon": "^1.17.3"
+    }
 }