Fixed merge conflict regarding version of express

seasoned_api/package.json

@@ -3,6 +3,8 @@
     "main": "webserver/server.js",
     "scripts": {
         "start": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/webserver/server.js",
+        "test": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. mocha --recursive test/system",
+        "coverage": "cross-env PLANFLIX_CONFIG=conf/test.json NODE_PATH=. istanbul cover -x script/autogenerate-documentation.js --include-all-sources --dir test/.coverage node_modules/mocha/bin/_mocha --recursive test/**/* -- --report lcovonly && cat test/.coverage/lcov.info | coveralls && rm -rf test/.coverage",
         "lint": "./node_modules/.bin/eslint src/webserver/"
     },
     "dependencies": {
@@ -10,7 +12,7 @@
         "body-parser": "~1.0.1",
         "cross-env": "^3.1.3",
         "express": "~4.11.0",
-        "jsonwebtoken": "^8.0.1",
+	"jsonwebtoken": "^8.0.1",
         "mongoose": "^3.6.13",
         "moviedb": "^0.2.10",
         "node-cache": "^4.1.1",
@@ -19,12 +21,17 @@
         "raven": "^2.2.1",
         "request": "^2.81.0",
         "request-promise": "^4.2",
-        "sqlite": "^2.2.1",
-        "sqlite3": "^2.5.0"
+        "sqlite": "^2.9.0"
     },
     "devDependencies": {
 	"eslint": "^4.9.0",
         "eslint-config-airbnb-base": "^12.1.0",
-        "eslint-plugin-import": "^2.8.0"
+        "eslint-plugin-import": "^2.8.0",
+        "eslint": "^4.9.0",
+        "istanbul": "^0.4.5",
+        "mocha": "^3.1.0",
+        "supertest": "^2.0.1",
+        "supertest-as-promised": "^4.0.1"
+
     }
 }