diff --git a/README.md b/README.md
index 2981e41..0637900 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 Simple recipe application for members of Founders & Coders community in Nazareth
 
 ### To get started:
-Click [here] (https://facnrecipev2.herokuapp.com/) to start FACN Recipe application
+Click [here] (https://facnrecipe-v2.herokuapp.com/) to start FACN Recipe application
 
 ### User story:
 As a student of Founders & Coders based in Nazareth, she/he can search recipes by clicking four different categories based on the origin of food.
diff --git a/package-lock.json b/package-lock.json
index 012d3d7..ec999fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,7 @@
    "name": "facnrecipe",
    "version": "1.0.0",
    "lockfileVersion": 1,
+   "requires": true,
    "dependencies": {
       "abbrev": {
          "version": "1.1.0",
@@ -25,7 +26,15 @@
          "version": "1.3.2",
          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "micromatch": "2.3.11",
+            "normalize-path": "2.1.1"
+         }
+>>>>>>> master
       },
       "ap": {
          "version": "0.2.0",
@@ -36,7 +45,14 @@
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "arr-flatten": "1.1.0"
+         }
+>>>>>>> master
       },
       "arr-flatten": {
          "version": "1.1.0",
@@ -82,13 +98,30 @@
          "version": "1.1.8",
          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
          "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+         }
+>>>>>>> master
       },
       "braces": {
          "version": "1.8.5",
          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "expand-range": "1.8.2",
+            "preserve": "0.2.0",
+            "repeat-element": "1.1.2"
+         }
+>>>>>>> master
       },
       "buffer-equal-constant-time": {
          "version": "1.0.1",
@@ -104,13 +137,39 @@
          "version": "1.1.3",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+         }
+>>>>>>> master
       },
       "chokidar": {
          "version": "1.7.0",
          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "anymatch": "1.3.2",
+            "async-each": "1.0.1",
+            "fsevents": "1.1.2",
+            "glob-parent": "2.0.0",
+            "inherits": "2.0.3",
+            "is-binary-path": "1.0.1",
+            "is-glob": "2.0.1",
+            "path-is-absolute": "1.0.1",
+            "readdirp": "2.1.0"
+         }
+>>>>>>> master
       },
       "concat-map": {
          "version": "0.0.1",
@@ -122,7 +181,21 @@
          "version": "1.4.0",
          "resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
          "integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "graceful-fs": "4.1.11",
+            "mkdirp": "0.5.1",
+            "object-assign": "4.1.1",
+            "os-tmpdir": "1.0.2",
+            "osenv": "0.1.4",
+            "uuid": "2.0.3",
+            "write-file-atomic": "1.3.4",
+            "xdg-basedir": "2.0.0"
+         }
+>>>>>>> master
       },
       "cookie": {
          "version": "0.3.1",
@@ -139,7 +212,14 @@
          "version": "2.6.8",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "ms": "2.0.0"
+         }
+>>>>>>> master
       },
       "deep-extend": {
          "version": "0.4.2",
@@ -157,18 +237,39 @@
          "version": "3.5.1",
          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
          "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "end-of-stream": "1.4.0",
+            "inherits": "2.0.3",
+            "readable-stream": "2.3.3",
+            "stream-shift": "1.0.0"
+         }
+>>>>>>> master
       },
       "ecdsa-sig-formatter": {
          "version": "1.0.9",
          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
-         "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE="
+         "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
+         "requires": {
+            "base64url": "2.0.0",
+            "safe-buffer": "5.1.1"
+         }
       },
       "end-of-stream": {
          "version": "1.4.0",
          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
          "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "once": "1.4.0"
+         }
+>>>>>>> master
       },
       "env2": {
          "version": "2.2.0",
@@ -191,25 +292,59 @@
          "version": "3.3.4",
          "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
          "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "duplexer": "0.1.1",
+            "from": "0.1.7",
+            "map-stream": "0.1.0",
+            "pause-stream": "0.0.11",
+            "split": "0.3.3",
+            "stream-combiner": "0.0.4",
+            "through": "2.3.8"
+         }
+>>>>>>> master
       },
       "expand-brackets": {
          "version": "0.1.5",
          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-posix-bracket": "0.1.1"
+         }
+>>>>>>> master
       },
       "expand-range": {
          "version": "1.8.2",
          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
          "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "fill-range": "2.2.3"
+         }
+>>>>>>> master
       },
       "extglob": {
          "version": "0.3.2",
          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-extglob": "1.0.0"
+         }
+>>>>>>> master
       },
       "filename-regex": {
          "version": "2.0.1",
@@ -221,7 +356,18 @@
          "version": "2.2.3",
          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
          "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-number": "2.1.0",
+            "isobject": "2.1.0",
+            "randomatic": "1.1.7",
+            "repeat-element": "1.1.2",
+            "repeat-string": "1.6.1"
+         }
+>>>>>>> master
       },
       "for-in": {
          "version": "1.0.2",
@@ -233,7 +379,14 @@
          "version": "0.1.5",
          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "for-in": "1.0.2"
+         }
+>>>>>>> master
       },
       "from": {
          "version": "0.1.7",
@@ -247,6 +400,10 @@
          "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
          "dev": true,
          "optional": true,
+         "requires": {
+            "nan": "2.6.2",
+            "node-pre-gyp": "0.6.36"
+         },
          "dependencies": {
             "abbrev": {
                "version": "1.1.0",
@@ -258,7 +415,15 @@
                "version": "4.11.8",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "co": "4.6.0",
+                  "json-stable-stringify": "1.0.1"
+               }
+>>>>>>> master
             },
             "ansi-regex": {
                "version": "2.1.1",
@@ -275,7 +440,15 @@
                "version": "1.1.4",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "delegates": "1.0.0",
+                  "readable-stream": "2.2.9"
+               }
+>>>>>>> master
             },
             "asn1": {
                "version": "0.2.3",
@@ -316,22 +489,51 @@
                "version": "1.0.1",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "tweetnacl": "0.14.5"
+               }
+>>>>>>> master
             },
             "block-stream": {
                "version": "0.0.9",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "inherits": "2.0.3"
+               }
+>>>>>>> master
             },
             "boom": {
                "version": "2.10.1",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "hoek": "2.16.3"
+               }
+>>>>>>> master
             },
             "brace-expansion": {
                "version": "1.1.7",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "balanced-match": "0.4.2",
+                  "concat-map": "0.0.1"
+               }
+>>>>>>> master
             },
             "buffer-shims": {
                "version": "1.0.0",
@@ -358,7 +560,14 @@
             "combined-stream": {
                "version": "1.0.5",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "delayed-stream": "1.0.0"
+               }
+>>>>>>> master
             },
             "concat-map": {
                "version": "0.0.1",
@@ -379,13 +588,23 @@
                "version": "2.0.5",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "boom": "2.10.1"
+               }
+>>>>>>> master
             },
             "dashdash": {
                "version": "1.14.1",
                "bundled": true,
                "dev": true,
                "optional": true,
+               "requires": {
+                  "assert-plus": "1.0.0"
+               },
                "dependencies": {
                   "assert-plus": {
                      "version": "1.0.0",
@@ -399,7 +618,14 @@
                "version": "2.6.8",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "ms": "2.0.0"
+               }
+>>>>>>> master
             },
             "deep-extend": {
                "version": "0.4.2",
@@ -422,7 +648,14 @@
                "version": "0.1.1",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "jsbn": "0.1.1"
+               }
+>>>>>>> master
             },
             "extend": {
                "version": "3.0.1",
@@ -445,7 +678,16 @@
                "version": "2.1.4",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "asynckit": "0.4.0",
+                  "combined-stream": "1.0.5",
+                  "mime-types": "2.1.15"
+               }
+>>>>>>> master
             },
             "fs.realpath": {
                "version": "1.0.0",
@@ -455,25 +697,61 @@
             "fstream": {
                "version": "1.0.11",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "graceful-fs": "4.1.11",
+                  "inherits": "2.0.3",
+                  "mkdirp": "0.5.1",
+                  "rimraf": "2.6.1"
+               }
+>>>>>>> master
             },
             "fstream-ignore": {
                "version": "1.0.5",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "fstream": "1.0.11",
+                  "inherits": "2.0.3",
+                  "minimatch": "3.0.4"
+               }
+>>>>>>> master
             },
             "gauge": {
                "version": "2.7.4",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "aproba": "1.1.1",
+                  "console-control-strings": "1.1.0",
+                  "has-unicode": "2.0.1",
+                  "object-assign": "4.1.1",
+                  "signal-exit": "3.0.2",
+                  "string-width": "1.0.2",
+                  "strip-ansi": "3.0.1",
+                  "wide-align": "1.1.2"
+               }
+>>>>>>> master
             },
             "getpass": {
                "version": "0.1.7",
                "bundled": true,
                "dev": true,
                "optional": true,
+               "requires": {
+                  "assert-plus": "1.0.0"
+               },
                "dependencies": {
                   "assert-plus": {
                      "version": "1.0.0",
@@ -486,7 +764,19 @@
             "glob": {
                "version": "7.1.2",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "fs.realpath": "1.0.0",
+                  "inflight": "1.0.6",
+                  "inherits": "2.0.3",
+                  "minimatch": "3.0.4",
+                  "once": "1.4.0",
+                  "path-is-absolute": "1.0.1"
+               }
+>>>>>>> master
             },
             "graceful-fs": {
                "version": "4.1.11",
@@ -503,7 +793,15 @@
                "version": "4.2.1",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "ajv": "4.11.8",
+                  "har-schema": "1.0.5"
+               }
+>>>>>>> master
             },
             "has-unicode": {
                "version": "2.0.1",
@@ -515,7 +813,17 @@
                "version": "3.1.3",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "boom": "2.10.1",
+                  "cryptiles": "2.0.5",
+                  "hoek": "2.16.3",
+                  "sntp": "1.0.9"
+               }
+>>>>>>> master
             },
             "hoek": {
                "version": "2.16.3",
@@ -526,12 +834,29 @@
                "version": "1.1.1",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "assert-plus": "0.2.0",
+                  "jsprim": "1.4.0",
+                  "sshpk": "1.13.0"
+               }
+>>>>>>> master
             },
             "inflight": {
                "version": "1.0.6",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "once": "1.4.0",
+                  "wrappy": "1.0.2"
+               }
+>>>>>>> master
             },
             "inherits": {
                "version": "2.0.3",
@@ -547,7 +872,14 @@
             "is-fullwidth-code-point": {
                "version": "1.0.0",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "number-is-nan": "1.0.1"
+               }
+>>>>>>> master
             },
             "is-typedarray": {
                "version": "1.0.0",
@@ -570,7 +902,14 @@
                "version": "1.0.2",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "jsbn": "0.1.1"
+               }
+>>>>>>> master
             },
             "jsbn": {
                "version": "0.1.1",
@@ -588,7 +927,14 @@
                "version": "1.0.1",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "jsonify": "0.0.0"
+               }
+>>>>>>> master
             },
             "json-stringify-safe": {
                "version": "5.0.1",
@@ -607,6 +953,12 @@
                "bundled": true,
                "dev": true,
                "optional": true,
+               "requires": {
+                  "assert-plus": "1.0.0",
+                  "extsprintf": "1.0.2",
+                  "json-schema": "0.2.3",
+                  "verror": "1.3.6"
+               },
                "dependencies": {
                   "assert-plus": {
                      "version": "1.0.0",
@@ -624,12 +976,26 @@
             "mime-types": {
                "version": "2.1.15",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "mime-db": "1.27.0"
+               }
+>>>>>>> master
             },
             "minimatch": {
                "version": "3.0.4",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "brace-expansion": "1.1.7"
+               }
+>>>>>>> master
             },
             "minimist": {
                "version": "0.0.8",
@@ -639,7 +1005,14 @@
             "mkdirp": {
                "version": "0.5.1",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "minimist": "0.0.8"
+               }
+>>>>>>> master
             },
             "ms": {
                "version": "2.0.0",
@@ -651,19 +1024,52 @@
                "version": "0.6.36",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "mkdirp": "0.5.1",
+                  "nopt": "4.0.1",
+                  "npmlog": "4.1.0",
+                  "rc": "1.2.1",
+                  "request": "2.81.0",
+                  "rimraf": "2.6.1",
+                  "semver": "5.3.0",
+                  "tar": "2.2.1",
+                  "tar-pack": "3.4.0"
+               }
+>>>>>>> master
             },
             "nopt": {
                "version": "4.0.1",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "abbrev": "1.1.0",
+                  "osenv": "0.1.4"
+               }
+>>>>>>> master
             },
             "npmlog": {
                "version": "4.1.0",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "are-we-there-yet": "1.1.4",
+                  "console-control-strings": "1.1.0",
+                  "gauge": "2.7.4",
+                  "set-blocking": "2.0.0"
+               }
+>>>>>>> master
             },
             "number-is-nan": {
                "version": "1.0.1",
@@ -685,7 +1091,14 @@
             "once": {
                "version": "1.4.0",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "wrappy": "1.0.2"
+               }
+>>>>>>> master
             },
             "os-homedir": {
                "version": "1.0.2",
@@ -703,7 +1116,15 @@
                "version": "0.1.4",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "os-homedir": "1.0.2",
+                  "os-tmpdir": "1.0.2"
+               }
+>>>>>>> master
             },
             "path-is-absolute": {
                "version": "1.0.1",
@@ -738,6 +1159,12 @@
                "bundled": true,
                "dev": true,
                "optional": true,
+               "requires": {
+                  "deep-extend": "0.4.2",
+                  "ini": "1.3.4",
+                  "minimist": "1.2.0",
+                  "strip-json-comments": "2.0.1"
+               },
                "dependencies": {
                   "minimist": {
                      "version": "1.2.0",
@@ -750,18 +1177,66 @@
             "readable-stream": {
                "version": "2.2.9",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "buffer-shims": "1.0.0",
+                  "core-util-is": "1.0.2",
+                  "inherits": "2.0.3",
+                  "isarray": "1.0.0",
+                  "process-nextick-args": "1.0.7",
+                  "string_decoder": "1.0.1",
+                  "util-deprecate": "1.0.2"
+               }
+>>>>>>> master
             },
             "request": {
                "version": "2.81.0",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "aws-sign2": "0.6.0",
+                  "aws4": "1.6.0",
+                  "caseless": "0.12.0",
+                  "combined-stream": "1.0.5",
+                  "extend": "3.0.1",
+                  "forever-agent": "0.6.1",
+                  "form-data": "2.1.4",
+                  "har-validator": "4.2.1",
+                  "hawk": "3.1.3",
+                  "http-signature": "1.1.1",
+                  "is-typedarray": "1.0.0",
+                  "isstream": "0.1.2",
+                  "json-stringify-safe": "5.0.1",
+                  "mime-types": "2.1.15",
+                  "oauth-sign": "0.8.2",
+                  "performance-now": "0.2.0",
+                  "qs": "6.4.0",
+                  "safe-buffer": "5.0.1",
+                  "stringstream": "0.0.5",
+                  "tough-cookie": "2.3.2",
+                  "tunnel-agent": "0.6.0",
+                  "uuid": "3.0.1"
+               }
+>>>>>>> master
             },
             "rimraf": {
                "version": "2.6.1",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "glob": "7.1.2"
+               }
+>>>>>>> master
             },
             "safe-buffer": {
                "version": "5.0.1",
@@ -790,13 +1265,31 @@
                "version": "1.0.9",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "hoek": "2.16.3"
+               }
+>>>>>>> master
             },
             "sshpk": {
                "version": "1.13.0",
                "bundled": true,
                "dev": true,
                "optional": true,
+               "requires": {
+                  "asn1": "0.2.3",
+                  "assert-plus": "1.0.0",
+                  "bcrypt-pbkdf": "1.0.1",
+                  "dashdash": "1.14.1",
+                  "ecc-jsbn": "0.1.1",
+                  "getpass": "0.1.7",
+                  "jodid25519": "1.0.2",
+                  "jsbn": "0.1.1",
+                  "tweetnacl": "0.14.5"
+               },
                "dependencies": {
                   "assert-plus": {
                      "version": "1.0.0",
@@ -809,12 +1302,28 @@
             "string_decoder": {
                "version": "1.0.1",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "safe-buffer": "5.0.1"
+               }
+>>>>>>> master
             },
             "string-width": {
                "version": "1.0.2",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "code-point-at": "1.1.0",
+                  "is-fullwidth-code-point": "1.0.0",
+                  "strip-ansi": "3.0.1"
+               }
+>>>>>>> master
             },
             "stringstream": {
                "version": "0.0.5",
@@ -825,7 +1334,14 @@
             "strip-ansi": {
                "version": "3.0.1",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "ansi-regex": "2.1.1"
+               }
+>>>>>>> master
             },
             "strip-json-comments": {
                "version": "2.0.1",
@@ -836,25 +1352,62 @@
             "tar": {
                "version": "2.2.1",
                "bundled": true,
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "block-stream": "0.0.9",
+                  "fstream": "1.0.11",
+                  "inherits": "2.0.3"
+               }
+>>>>>>> master
             },
             "tar-pack": {
                "version": "3.4.0",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "debug": "2.6.8",
+                  "fstream": "1.0.11",
+                  "fstream-ignore": "1.0.5",
+                  "once": "1.4.0",
+                  "readable-stream": "2.2.9",
+                  "rimraf": "2.6.1",
+                  "tar": "2.2.1",
+                  "uid-number": "0.0.6"
+               }
+>>>>>>> master
             },
             "tough-cookie": {
                "version": "2.3.2",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "punycode": "1.4.1"
+               }
+>>>>>>> master
             },
             "tunnel-agent": {
                "version": "0.6.0",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "safe-buffer": "5.0.1"
+               }
+>>>>>>> master
             },
             "tweetnacl": {
                "version": "0.14.5",
@@ -883,13 +1436,27 @@
                "version": "1.3.6",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "extsprintf": "1.0.2"
+               }
+>>>>>>> master
             },
             "wide-align": {
                "version": "1.1.2",
                "bundled": true,
                "dev": true,
+<<<<<<< HEAD
                "optional": true
+=======
+               "optional": true,
+               "requires": {
+                  "string-width": "1.0.2"
+               }
+>>>>>>> master
             },
             "wrappy": {
                "version": "1.0.2",
@@ -902,19 +1469,49 @@
          "version": "0.3.0",
          "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
          "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "glob-parent": "2.0.0",
+            "is-glob": "2.0.1"
+         }
+>>>>>>> master
       },
       "glob-parent": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-glob": "2.0.1"
+         }
+>>>>>>> master
       },
       "got": {
          "version": "3.3.1",
          "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz",
          "integrity": "sha1-5dDtSvVfw+701WAHdp2YGSvLLso=",
          "dev": true,
+<<<<<<< HEAD
+=======
+         "requires": {
+            "duplexify": "3.5.1",
+            "infinity-agent": "2.0.3",
+            "is-redirect": "1.0.0",
+            "is-stream": "1.1.0",
+            "lowercase-keys": "1.0.0",
+            "nested-error-stacks": "1.0.2",
+            "object-assign": "3.0.0",
+            "prepend-http": "1.0.4",
+            "read-all-stream": "3.1.0",
+            "timed-out": "2.0.0"
+         },
+>>>>>>> master
          "dependencies": {
             "object-assign": {
                "version": "3.0.0",
@@ -934,7 +1531,14 @@
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "ansi-regex": "2.1.1"
+         }
+>>>>>>> master
       },
       "hoek": {
          "version": "2.16.3",
@@ -975,7 +1579,14 @@
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "binary-extensions": "1.10.0"
+         }
+>>>>>>> master
       },
       "is-buffer": {
          "version": "1.1.5",
@@ -993,7 +1604,14 @@
          "version": "0.1.3",
          "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
          "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-primitive": "2.0.0"
+         }
+>>>>>>> master
       },
       "is-extendable": {
          "version": "0.1.1",
@@ -1011,13 +1629,27 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
          "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "number-is-nan": "1.0.1"
+         }
+>>>>>>> master
       },
       "is-glob": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-extglob": "1.0.0"
+         }
+>>>>>>> master
       },
       "is-npm": {
          "version": "1.0.0",
@@ -1029,7 +1661,14 @@
          "version": "2.1.0",
          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "kind-of": "3.2.2"
+         }
+>>>>>>> master
       },
       "is-posix-bracket": {
          "version": "0.1.1",
@@ -1070,12 +1709,25 @@
          "version": "2.1.0",
          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "isarray": "1.0.0"
+         }
+>>>>>>> master
       },
       "joi": {
          "version": "6.10.1",
          "resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
-         "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY="
+         "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
+         "requires": {
+            "hoek": "2.16.3",
+            "isemail": "1.2.0",
+            "moment": "2.18.1",
+            "topo": "1.1.0"
+         }
       },
       "js-string-escape": {
          "version": "1.0.1",
@@ -1085,35 +1737,75 @@
       "jsonwebtoken": {
          "version": "7.4.2",
          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.2.tgz",
-         "integrity": "sha1-VxuQPAfodcD8WSA9GseGZ9gOCc0="
+         "integrity": "sha1-VxuQPAfodcD8WSA9GseGZ9gOCc0=",
+         "requires": {
+            "joi": "6.10.1",
+            "jws": "3.1.4",
+            "lodash.once": "4.1.1",
+            "ms": "2.0.0",
+            "xtend": "4.0.1"
+         }
       },
       "jwa": {
          "version": "1.1.5",
          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
-         "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU="
+         "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
+         "requires": {
+            "base64url": "2.0.0",
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.9",
+            "safe-buffer": "5.1.1"
+         }
       },
       "jws": {
          "version": "3.1.4",
          "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
-         "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI="
+         "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
+         "requires": {
+            "base64url": "2.0.0",
+            "jwa": "1.1.5",
+            "safe-buffer": "5.1.1"
+         }
       },
       "kind-of": {
          "version": "3.2.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-buffer": "1.1.5"
+         }
+>>>>>>> master
       },
       "latest-version": {
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz",
          "integrity": "sha1-cs/Ebj6NG+ZR4eu1Tqn26pbzdLs=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "package-json": "1.2.0"
+         }
+>>>>>>> master
       },
       "lodash._baseassign": {
          "version": "3.2.0",
          "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
          "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "lodash._basecopy": "3.0.1",
+            "lodash.keys": "3.1.2"
+         }
+>>>>>>> master
       },
       "lodash._basecopy": {
          "version": "3.0.1",
@@ -1131,7 +1823,16 @@
          "version": "3.1.1",
          "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
          "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "lodash._bindcallback": "3.0.1",
+            "lodash._isiterateecall": "3.0.9",
+            "lodash.restparam": "3.6.1"
+         }
+>>>>>>> master
       },
       "lodash._getnative": {
          "version": "3.9.1",
@@ -1149,13 +1850,30 @@
          "version": "3.2.0",
          "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
          "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "lodash._baseassign": "3.2.0",
+            "lodash._createassigner": "3.1.1",
+            "lodash.keys": "3.1.2"
+         }
+>>>>>>> master
       },
       "lodash.defaults": {
          "version": "3.1.2",
          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
          "integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "lodash.assign": "3.2.0",
+            "lodash.restparam": "3.6.1"
+         }
+>>>>>>> master
       },
       "lodash.isarguments": {
          "version": "3.1.0",
@@ -1173,7 +1891,16 @@
          "version": "3.1.2",
          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
          "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "lodash._getnative": "3.9.1",
+            "lodash.isarguments": "3.1.0",
+            "lodash.isarray": "3.0.4"
+         }
+>>>>>>> master
       },
       "lodash.once": {
          "version": "4.1.1",
@@ -1202,13 +1929,39 @@
          "version": "2.3.11",
          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "arr-diff": "2.0.0",
+            "array-unique": "0.2.1",
+            "braces": "1.8.5",
+            "expand-brackets": "0.1.5",
+            "extglob": "0.3.2",
+            "filename-regex": "2.0.1",
+            "is-extglob": "1.0.0",
+            "is-glob": "2.0.1",
+            "kind-of": "3.2.2",
+            "normalize-path": "2.1.1",
+            "object.omit": "2.0.1",
+            "parse-glob": "3.0.4",
+            "regex-cache": "0.4.3"
+         }
+>>>>>>> master
       },
       "minimatch": {
          "version": "3.0.4",
          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "brace-expansion": "1.1.8"
+         }
+>>>>>>> master
       },
       "minimist": {
          "version": "0.0.8",
@@ -1220,7 +1973,14 @@
          "version": "0.5.1",
          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "minimist": "0.0.8"
+         }
+>>>>>>> master
       },
       "moment": {
          "version": "2.18.1",
@@ -1243,25 +2003,62 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
          "integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "inherits": "2.0.3"
+         }
+>>>>>>> master
       },
       "nodemon": {
          "version": "1.11.0",
          "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.11.0.tgz",
          "integrity": "sha1-ImxWK9KnsT09dRi0mtSCijYj0Gw=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "chokidar": "1.7.0",
+            "debug": "2.6.8",
+            "es6-promise": "3.3.1",
+            "ignore-by-default": "1.0.1",
+            "lodash.defaults": "3.1.2",
+            "minimatch": "3.0.4",
+            "ps-tree": "1.1.0",
+            "touch": "1.0.0",
+            "undefsafe": "0.0.3",
+            "update-notifier": "0.5.0"
+         }
+>>>>>>> master
       },
       "nopt": {
          "version": "1.0.10",
          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "abbrev": "1.1.0"
+         }
+>>>>>>> master
       },
       "normalize-path": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "remove-trailing-separator": "1.1.0"
+         }
+>>>>>>> master
       },
       "number-is-nan": {
          "version": "1.0.1",
@@ -1279,13 +2076,28 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
          "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "for-own": "0.1.5",
+            "is-extendable": "0.1.1"
+         }
+>>>>>>> master
       },
       "once": {
          "version": "1.4.0",
          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "wrappy": "1.0.2"
+         }
+>>>>>>> master
       },
       "os-homedir": {
          "version": "1.0.2",
@@ -1303,13 +2115,29 @@
          "version": "0.1.4",
          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
          "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+         }
+>>>>>>> master
       },
       "package-json": {
          "version": "1.2.0",
          "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz",
          "integrity": "sha1-yOysCUInzfdqMWh07QXifMk5oOA=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "got": "3.3.1",
+            "registry-url": "3.1.0"
+         }
+>>>>>>> master
       },
       "packet-reader": {
          "version": "0.3.1",
@@ -1320,7 +2148,17 @@
          "version": "3.0.4",
          "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
          "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "glob-base": "0.3.0",
+            "is-dotfile": "1.0.3",
+            "is-extglob": "1.0.0",
+            "is-glob": "2.0.1"
+         }
+>>>>>>> master
       },
       "path-is-absolute": {
          "version": "1.0.1",
@@ -1332,12 +2170,29 @@
          "version": "0.0.11",
          "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
          "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "through": "2.3.8"
+         }
+>>>>>>> master
       },
       "pg": {
          "version": "7.1.2",
          "resolved": "https://registry.npmjs.org/pg/-/pg-7.1.2.tgz",
          "integrity": "sha1-Xc4g8+1oBlFETcMRBh1xnMkgw9g=",
+         "requires": {
+            "buffer-writer": "1.0.1",
+            "js-string-escape": "1.0.1",
+            "packet-reader": "0.3.1",
+            "pg-connection-string": "0.1.3",
+            "pg-pool": "2.0.3",
+            "pg-types": "1.12.0",
+            "pgpass": "1.0.2",
+            "semver": "4.3.2"
+         },
          "dependencies": {
             "semver": {
                "version": "4.3.2",
@@ -1359,17 +2214,30 @@
       "pg-types": {
          "version": "1.12.0",
          "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.0.tgz",
-         "integrity": "sha1-itO3uJfj/UY+Yt4kGtX8ZAtKZvA="
+         "integrity": "sha1-itO3uJfj/UY+Yt4kGtX8ZAtKZvA=",
+         "requires": {
+            "ap": "0.2.0",
+            "postgres-array": "1.0.2",
+            "postgres-bytea": "1.0.0",
+            "postgres-date": "1.0.3",
+            "postgres-interval": "1.1.1"
+         }
       },
       "pgpass": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
          "integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
+         "requires": {
+            "split": "1.0.1"
+         },
          "dependencies": {
             "split": {
                "version": "1.0.1",
                "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-               "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="
+               "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+               "requires": {
+                  "through": "2.3.8"
+               }
             }
          }
       },
@@ -1383,7 +2251,14 @@
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
          "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "pinkie": "2.0.4"
+         }
+>>>>>>> master
       },
       "postgres-array": {
          "version": "1.0.2",
@@ -1403,7 +2278,10 @@
       "postgres-interval": {
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz",
-         "integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA=="
+         "integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
+         "requires": {
+            "xtend": "4.0.1"
+         }
       },
       "prepend-http": {
          "version": "1.0.4",
@@ -1427,25 +2305,52 @@
          "version": "1.1.0",
          "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
          "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "event-stream": "3.3.4"
+         }
+>>>>>>> master
       },
       "randomatic": {
          "version": "1.1.7",
          "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
          "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
          "dev": true,
+<<<<<<< HEAD
+=======
+         "requires": {
+            "is-number": "3.0.0",
+            "kind-of": "4.0.0"
+         },
+>>>>>>> master
          "dependencies": {
             "is-number": {
                "version": "3.0.0",
                "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
                "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
                "dev": true,
+<<<<<<< HEAD
+=======
+               "requires": {
+                  "kind-of": "3.2.2"
+               },
+>>>>>>> master
                "dependencies": {
                   "kind-of": {
                      "version": "3.2.2",
                      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
                      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+<<<<<<< HEAD
                      "dev": true
+=======
+                     "dev": true,
+                     "requires": {
+                        "is-buffer": "1.1.5"
+                     }
+>>>>>>> master
                   }
                }
             },
@@ -1453,7 +2358,14 @@
                "version": "4.0.0",
                "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
                "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+<<<<<<< HEAD
                "dev": true
+=======
+               "dev": true,
+               "requires": {
+                  "is-buffer": "1.1.5"
+               }
+>>>>>>> master
             }
          }
       },
@@ -1462,6 +2374,15 @@
          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
          "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
          "dev": true,
+<<<<<<< HEAD
+=======
+         "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+         },
+>>>>>>> master
          "dependencies": {
             "minimist": {
                "version": "1.2.0",
@@ -1475,36 +2396,87 @@
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
          "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "pinkie-promise": "2.0.1",
+            "readable-stream": "2.3.3"
+         }
+>>>>>>> master
       },
       "readable-stream": {
          "version": "2.3.3",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
          "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
+         }
+>>>>>>> master
       },
       "readdirp": {
          "version": "2.1.0",
          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
          "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "graceful-fs": "4.1.11",
+            "minimatch": "3.0.4",
+            "readable-stream": "2.3.3",
+            "set-immediate-shim": "1.0.1"
+         }
+>>>>>>> master
       },
       "regex-cache": {
          "version": "0.4.3",
          "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
          "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-equal-shallow": "0.1.3",
+            "is-primitive": "2.0.0"
+         }
+>>>>>>> master
       },
       "registry-url": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
          "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+<<<<<<< HEAD
          "dev": true
       },
       "remove-trailing-separator": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz",
          "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=",
+=======
+         "dev": true,
+         "requires": {
+            "rc": "1.2.1"
+         }
+      },
+      "remove-trailing-separator": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+         "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+>>>>>>> master
          "dev": true
       },
       "repeat-element": {
@@ -1523,7 +2495,14 @@
          "version": "1.1.3",
          "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
          "integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "is-finite": "1.0.2"
+         }
+>>>>>>> master
       },
       "safe-buffer": {
          "version": "5.1.1",
@@ -1540,7 +2519,14 @@
          "version": "2.1.0",
          "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
          "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "semver": "5.4.1"
+         }
+>>>>>>> master
       },
       "set-immediate-shim": {
          "version": "1.0.1",
@@ -1558,13 +2544,27 @@
          "version": "0.3.3",
          "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
          "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "through": "2.3.8"
+         }
+>>>>>>> master
       },
       "stream-combiner": {
          "version": "0.0.4",
          "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
          "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "duplexer": "0.1.1"
+         }
+>>>>>>> master
       },
       "stream-shift": {
          "version": "1.0.0",
@@ -1576,19 +2576,40 @@
          "version": "1.0.3",
          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "safe-buffer": "5.1.1"
+         }
+>>>>>>> master
       },
       "string-length": {
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
          "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "strip-ansi": "3.0.1"
+         }
+>>>>>>> master
       },
       "strip-ansi": {
          "version": "3.0.1",
          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "ansi-regex": "2.1.1"
+         }
+>>>>>>> master
       },
       "strip-json-comments": {
          "version": "2.0.1",
@@ -1616,13 +2637,23 @@
       "topo": {
          "version": "1.1.0",
          "resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
-         "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU="
+         "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
+         "requires": {
+            "hoek": "2.16.3"
+         }
       },
       "touch": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
          "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "nopt": "1.0.10"
+         }
+>>>>>>> master
       },
       "undefsafe": {
          "version": "0.0.3",
@@ -1634,7 +2665,20 @@
          "version": "0.5.0",
          "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz",
          "integrity": "sha1-B7XcIGazYnqztPUwEw9+3doHpMw=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "chalk": "1.1.3",
+            "configstore": "1.4.0",
+            "is-npm": "1.0.0",
+            "latest-version": "1.0.1",
+            "repeating": "1.1.3",
+            "semver-diff": "2.1.0",
+            "string-length": "1.0.1"
+         }
+>>>>>>> master
       },
       "util-deprecate": {
          "version": "1.0.2",
@@ -1658,13 +2702,29 @@
          "version": "1.3.4",
          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
          "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "graceful-fs": "4.1.11",
+            "imurmurhash": "0.1.4",
+            "slide": "1.1.6"
+         }
+>>>>>>> master
       },
       "xdg-basedir": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
          "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+<<<<<<< HEAD
          "dev": true
+=======
+         "dev": true,
+         "requires": {
+            "os-homedir": "1.0.2"
+         }
+>>>>>>> master
       },
       "xtend": {
          "version": "4.0.1",
diff --git a/src/router.js b/src/router.js
index 6156e4a..5af717f 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,6 +1,5 @@
 const http = require('http');
 const qs = require('querystring');
-const pg = require('pg');
 const getData = require('./getData');
 const handlers = require('./handlers');
 const dbConnection = require('../database/db_connection');