Merge branch 'rewrite' of https://notabug.org/RemixDevs/DeezloaderRemix into rewrite
authorRemixDev <deezloaderremix@gmail.com>
Fri, 18 Jan 2019 18:39:39 +0000 (19:39 +0100)
committerRemixDev <deezloaderremix@gmail.com>
Fri, 18 Jan 2019 18:39:39 +0000 (19:39 +0100)
1  2 
app/package-lock.json
package-lock.json

index 8561208aa3307a3be0da7cf21dd1099388b06953,8aa4286a1c4cfe1b8f6e19943f916354b6ccde1f..4a12b81dafbe2c1b71820a5a16f793c60c86db86
@@@ -4,6 -4,14 +4,17 @@@
        "lockfileVersion": 1,
        "requires": true,
        "dependencies": {
++<<<<<<< HEAD
++=======
+               "abs": {
+                       "version": "1.3.12",
+                       "resolved": "https://registry.npmjs.org/abs/-/abs-1.3.12.tgz",
+                       "integrity": "sha512-3gGc4URRHTUhdTOzRpnTKSoK+Bo9CcYTMKw7QYEFGzasu9on72GKjXMjZZNYKlAGqbPZfPqCRFRB3zGrX6260A==",
+                       "requires": {
+                               "ul": "^5.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "accepts": {
                        "version": "1.3.5",
                        "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
                        "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
                },
                "ajv": {
++<<<<<<< HEAD
 +                      "version": "6.7.0",
 +                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
 +                      "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
 +                      "requires": {
 +                              "fast-deep-equal": "^2.0.1",
 +                              "fast-json-stable-stringify": "^2.0.0",
 +                              "json-schema-traverse": "^0.4.1",
 +                              "uri-js": "^4.2.2"
++=======
+                       "version": "5.5.2",
+                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+                       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+                       "requires": {
+                               "co": "^4.6.0",
+                               "fast-deep-equal": "^1.0.0",
+                               "fast-json-stable-stringify": "^2.0.0",
+                               "json-schema-traverse": "^0.3.0"
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        }
                },
                "app-root-path": {
                },
                "array-flatten": {
                        "version": "1.1.1",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
                },
                "arraybuffer.slice": {
                        }
                },
                "blob": {
++<<<<<<< HEAD
 +                      "version": "0.0.5",
 +                      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
 +                      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
 +              },
 +              "bluebird": {
 +                      "version": "3.5.3",
 +                      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
 +                      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw=="
++=======
+                       "version": "0.0.4",
+                       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+                       "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "body-parser": {
                        "version": "1.18.3",
                                "concat-map": "0.0.1"
                        }
                },
++<<<<<<< HEAD
++=======
+               "builtin-modules": {
+                       "version": "1.1.1",
+                       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+                       "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "bytes": {
                        "version": "3.0.0",
                        "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
                        "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
                        "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
                },
++<<<<<<< HEAD
++=======
+               "capture-stack-trace": {
+                       "version": "1.0.1",
+                       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+                       "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "caseless": {
                        "version": "0.12.0",
                        "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
                        "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
                },
++<<<<<<< HEAD
++=======
+               "co": {
+                       "version": "4.6.0",
+                       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+                       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "combined-stream": {
                        "version": "1.0.7",
                        "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
                        "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
                        "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
                },
++<<<<<<< HEAD
++=======
+               "create-error-class": {
+                       "version": "3.0.2",
+                       "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+                       "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+                       "requires": {
+                               "capture-stack-trace": "^1.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "dashdash": {
                        "version": "1.14.1",
                        "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
                                "ms": "2.0.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "deep-extend": {
+                       "version": "0.6.0",
+                       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+                       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+               },
+               "deffy": {
+                       "version": "2.2.2",
+                       "resolved": "https://registry.npmjs.org/deffy/-/deffy-2.2.2.tgz",
+                       "integrity": "sha1-CI9AkTy0cHhlP6b2l8IG4DRx1SM=",
+                       "requires": {
+                               "typpy": "^2.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "delayed-stream": {
                        "version": "1.0.0",
                        "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
                        "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
                        "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
                },
++<<<<<<< HEAD
++=======
+               "duplexer2": {
+                       "version": "0.1.4",
+                       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+                       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+                       "requires": {
+                               "readable-stream": "^2.0.2"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "ecc-jsbn": {
                        "version": "0.1.2",
                        "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
                        "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
                },
                "electron-context-menu": {
++<<<<<<< HEAD
 +                      "version": "0.10.1",
 +                      "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.10.1.tgz",
 +                      "integrity": "sha512-KFkKwFbT6iJUgarEknYuXQlJAT+naJZtSWFBtHf9RiSb70wscWdDNpYoUERzF7FgqYE1Mil4npfRWsjqGLwtog==",
 +                      "requires": {
 +                              "electron-dl": "^1.2.0",
 +                              "electron-is-dev": "^1.0.1"
++=======
+                       "version": "0.10.0",
+                       "resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.10.0.tgz",
+                       "integrity": "sha512-8dv+cOIpGuSmxAje3qdydd7kzfUTHBiEq6V80CqW76P5M92sEl0WpHHhNKxKFZ2L+mNr5Lp4R9qGjyfDiYI8yg==",
+                       "requires": {
+                               "electron-dl": "^1.2.0",
+                               "electron-is-dev": "^0.3.0"
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        }
                },
                "electron-dl": {
                        }
                },
                "electron-is-dev": {
++<<<<<<< HEAD
 +                      "version": "1.0.1",
 +                      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.0.1.tgz",
 +                      "integrity": "sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w=="
++=======
+                       "version": "0.3.0",
+                       "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
+                       "integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "electron-window-state-manager": {
                        "version": "0.3.2",
                        "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
                },
                "engine.io": {
++<<<<<<< HEAD
 +                      "version": "3.2.1",
 +                      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
 +                      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
++=======
+                       "version": "3.2.0",
+                       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.0.tgz",
+                       "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "requires": {
                                "accepts": "~1.3.4",
                                "base64id": "1.0.0",
                },
                "engine.io-client": {
                        "version": "3.2.1",
++<<<<<<< HEAD
 +                      "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
++=======
+                       "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
                        "requires": {
                                "component-emitter": "1.2.1",
                        }
                },
                "engine.io-parser": {
++<<<<<<< HEAD
 +                      "version": "2.1.3",
 +                      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
 +                      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
++=======
+                       "version": "2.1.2",
+                       "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
+                       "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "requires": {
                                "after": "0.8.2",
                                "arraybuffer.slice": "~0.0.7",
                                "base64-arraybuffer": "0.1.5",
++<<<<<<< HEAD
 +                              "blob": "0.0.5",
 +                              "has-binary2": "~1.0.2"
 +                      }
 +              },
++=======
+                               "blob": "0.0.4",
+                               "has-binary2": "~1.0.2"
+                       }
+               },
+               "err": {
+                       "version": "1.1.1",
+                       "resolved": "https://registry.npmjs.org/err/-/err-1.1.1.tgz",
+                       "integrity": "sha1-65KOLhGjFmSPeCgz0PlyWLpDwvg=",
+                       "requires": {
+                               "typpy": "^2.2.0"
+                       }
+               },
+               "error-ex": {
+                       "version": "1.3.2",
+                       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+                       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+                       "requires": {
+                               "is-arrayish": "^0.2.1"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "escape-html": {
                        "version": "1.0.3",
                        "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
                        "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
                        "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
                },
++<<<<<<< HEAD
++=======
+               "exec-limiter": {
+                       "version": "3.2.11",
+                       "resolved": "https://registry.npmjs.org/exec-limiter/-/exec-limiter-3.2.11.tgz",
+                       "integrity": "sha512-In82PmbeZ7spR2eJh2mlxVOU2q+TqevTvArNIyjHWasvSZuHSUqz3DqgWOOrTQir1/Q1yYE7SOdiqAsLrEP8Ng==",
+                       "requires": {
+                               "limit-it": "^3.0.0",
+                               "typpy": "^2.1.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "express": {
                        "version": "4.16.4",
                        "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
                        "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
                },
                "fast-deep-equal": {
++<<<<<<< HEAD
 +                      "version": "2.0.1",
 +                      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
 +                      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
++=======
+                       "version": "1.1.0",
+                       "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+                       "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "fast-json-stable-stringify": {
                        "version": "2.0.0",
                        "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
                        "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
                },
++<<<<<<< HEAD
++=======
+               "function.name": {
+                       "version": "1.0.11",
+                       "resolved": "https://registry.npmjs.org/function.name/-/function.name-1.0.11.tgz",
+                       "integrity": "sha512-dR60geqE4iI/siyBiWGcUjrQNtMqvToGXR/RkVkSSm4iH8FiHkIx2ljUFFiOZMbgBl/N9o9+VzikNp2hVV6y2Q==",
+                       "requires": {
+                               "noop6": "^1.0.1"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "getpass": {
                        "version": "0.1.7",
                        "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
                                "assert-plus": "^1.0.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "git-package-json": {
+                       "version": "1.4.8",
+                       "resolved": "https://registry.npmjs.org/git-package-json/-/git-package-json-1.4.8.tgz",
+                       "integrity": "sha512-m8RMUABVtiMwOhRaCmB2fQnkBfVsKbg9lJqB/lDfXCLl2+qFQNhIWPsqtfP9uZLHS69V7DdhoIFA5zW5PQgr9g==",
+                       "requires": {
+                               "deffy": "^2.2.1",
+                               "err": "^1.1.1",
+                               "gry": "^5.0.0",
+                               "normalize-package-data": "^2.3.5",
+                               "oargv": "^3.4.1",
+                               "one-by-one": "^3.1.0",
+                               "r-json": "^1.2.1",
+                               "r-package-json": "^1.0.0",
+                               "tmp": "0.0.28"
+                       }
+               },
+               "git-source": {
+                       "version": "1.1.8",
+                       "resolved": "https://registry.npmjs.org/git-source/-/git-source-1.1.8.tgz",
+                       "integrity": "sha512-l/rT/+l5MTPrO7suPzSMD9IiQsbp7oE9z91imvKnSsxconIMWWyrtVOcQI7MA53lRdmBaFju5d8lW3th76X6hg==",
+                       "requires": {
+                               "git-url-parse": "^5.0.1"
+                       }
+               },
+               "git-up": {
+                       "version": "1.2.1",
+                       "resolved": "http://registry.npmjs.org/git-up/-/git-up-1.2.1.tgz",
+                       "integrity": "sha1-JkSAoAax2EJhrB/gmjpRacV+oZ0=",
+                       "requires": {
+                               "is-ssh": "^1.0.0",
+                               "parse-url": "^1.0.0"
+                       }
+               },
+               "git-url-parse": {
+                       "version": "5.0.1",
+                       "resolved": "http://registry.npmjs.org/git-url-parse/-/git-url-parse-5.0.1.tgz",
+                       "integrity": "sha1-/j15xnRq4FBIz6UIyB553du6OEM=",
+                       "requires": {
+                               "git-up": "^1.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "glob": {
                        "version": "7.1.3",
                        "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
                                "path-is-absolute": "^1.0.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "got": {
+                       "version": "5.7.1",
+                       "resolved": "http://registry.npmjs.org/got/-/got-5.7.1.tgz",
+                       "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
+                       "requires": {
+                               "create-error-class": "^3.0.1",
+                               "duplexer2": "^0.1.4",
+                               "is-redirect": "^1.0.0",
+                               "is-retry-allowed": "^1.0.0",
+                               "is-stream": "^1.0.0",
+                               "lowercase-keys": "^1.0.0",
+                               "node-status-codes": "^1.0.0",
+                               "object-assign": "^4.0.1",
+                               "parse-json": "^2.1.0",
+                               "pinkie-promise": "^2.0.0",
+                               "read-all-stream": "^3.0.0",
+                               "readable-stream": "^2.0.5",
+                               "timed-out": "^3.0.0",
+                               "unzip-response": "^1.0.2",
+                               "url-parse-lax": "^1.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "graceful-fs": {
                        "version": "4.1.15",
                        "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
                        "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
                },
++<<<<<<< HEAD
++=======
+               "gry": {
+                       "version": "5.0.7",
+                       "resolved": "https://registry.npmjs.org/gry/-/gry-5.0.7.tgz",
+                       "integrity": "sha1-3JjiUO13eOgsSpLCCNc1CzD56c8=",
+                       "requires": {
+                               "abs": "^1.2.1",
+                               "exec-limiter": "^3.0.0",
+                               "one-by-one": "^3.0.0",
+                               "ul": "^5.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "har-schema": {
                        "version": "2.0.0",
                        "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
                        "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
                },
                "har-validator": {
++<<<<<<< HEAD
 +                      "version": "5.1.3",
 +                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
 +                      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
 +                      "requires": {
 +                              "ajv": "^6.5.5",
++=======
+                       "version": "5.0.3",
+                       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+                       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+                       "requires": {
+                               "ajv": "^5.1.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "har-schema": "^2.0.0"
                        }
                },
                        "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
                        "requires": {
                                "isarray": "2.0.1"
++<<<<<<< HEAD
++=======
+                       },
+                       "dependencies": {
+                               "isarray": {
+                                       "version": "2.0.1",
+                                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+                                       "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+                               }
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        }
                },
                "has-cors": {
                        "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
                        "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
                },
++<<<<<<< HEAD
++=======
+               "hosted-git-info": {
+                       "version": "2.7.1",
+                       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+                       "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "http-errors": {
                        "version": "1.6.3",
                        "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
                        "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                        "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
                },
++<<<<<<< HEAD
++=======
+               "ini": {
+                       "version": "1.3.5",
+                       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+                       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "ipaddr.js": {
                        "version": "1.8.0",
                        "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
                        "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
                },
++<<<<<<< HEAD
++=======
+               "is-arrayish": {
+                       "version": "0.2.1",
+                       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+                       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+               },
+               "is-builtin-module": {
+                       "version": "1.0.0",
+                       "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+                       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+                       "requires": {
+                               "builtin-modules": "^1.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "is-plain-obj": {
                        "version": "1.1.0",
                        "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
                        "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
                },
++<<<<<<< HEAD
++=======
+               "is-redirect": {
+                       "version": "1.0.0",
+                       "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+                       "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+               },
+               "is-retry-allowed": {
+                       "version": "1.1.0",
+                       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+                       "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
+               },
+               "is-ssh": {
+                       "version": "1.3.0",
+                       "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.0.tgz",
+                       "integrity": "sha1-6+oRaaJhTaOSpjdANmw84EnY3/Y=",
+                       "requires": {
+                               "protocols": "^1.1.0"
+                       }
+               },
+               "is-stream": {
+                       "version": "1.1.0",
+                       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+                       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "is-typedarray": {
                        "version": "1.0.0",
                        "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
                        "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
                },
                "isarray": {
++<<<<<<< HEAD
 +                      "version": "2.0.1",
 +                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
 +                      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
++=======
+                       "version": "1.0.0",
+                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+                       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "isstream": {
                        "version": "0.1.2",
                        "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
                        "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
                },
++<<<<<<< HEAD
++=======
+               "iterate-object": {
+                       "version": "1.3.2",
+                       "resolved": "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz",
+                       "integrity": "sha1-JOwVr/pdADnog5aVohwsrh9Ftms="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "jsbn": {
                        "version": "0.1.1",
                        "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
                        "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
                },
                "json-schema-traverse": {
++<<<<<<< HEAD
 +                      "version": "0.4.1",
 +                      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 +                      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
++=======
+                       "version": "0.3.1",
+                       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+                       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "json-stringify-safe": {
                        "version": "5.0.1",
                                "verror": "1.10.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "limit-it": {
+                       "version": "3.2.8",
+                       "resolved": "https://registry.npmjs.org/limit-it/-/limit-it-3.2.8.tgz",
+                       "integrity": "sha1-uXsBRhzPVNt3fP3318Dty/sBCUo=",
+                       "requires": {
+                               "typpy": "^2.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "lodash": {
                        "version": "4.17.11",
                        "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
                        "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
                },
++<<<<<<< HEAD
++=======
+               "lowercase-keys": {
+                       "version": "1.0.1",
+                       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+                       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "media-typer": {
                        "version": "0.3.0",
                        "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
                },
                "minimist": {
                        "version": "0.0.8",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
                },
                "mkdirp": {
                        "version": "0.5.1",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
                        "requires": {
                                "minimist": "0.0.8"
                        "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
                        "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
                },
++<<<<<<< HEAD
 +              "node-downloader-helper": {
 +                      "version": "1.0.9",
 +                      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.9.tgz",
 +                      "integrity": "sha512-X2cuBotLy2D3LdQAvhOAZ6IfcMGT6ssn+hCEm6yPJzhjr+S/YjyTLTxhnAe1pr5/jxGABD+b3SN8WpuBL5J2Dw=="
 +              },
 +              "oauth-sign": {
 +                      "version": "0.9.0",
 +                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
 +                      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
++=======
+               "node-status-codes": {
+                       "version": "1.0.0",
+                       "resolved": "http://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+                       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
+               },
+               "noop6": {
+                       "version": "1.0.7",
+                       "resolved": "https://registry.npmjs.org/noop6/-/noop6-1.0.7.tgz",
+                       "integrity": "sha1-lnZ78gWLpZyoy5FVk0fdyAI5+o4="
+               },
+               "normalize-package-data": {
+                       "version": "2.4.0",
+                       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+                       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+                       "requires": {
+                               "hosted-git-info": "^2.1.4",
+                               "is-builtin-module": "^1.0.0",
+                               "semver": "2 || 3 || 4 || 5",
+                               "validate-npm-package-license": "^3.0.1"
+                       }
+               },
+               "oargv": {
+                       "version": "3.4.8",
+                       "resolved": "https://registry.npmjs.org/oargv/-/oargv-3.4.8.tgz",
+                       "integrity": "sha1-e248D8y9TEHkTLQy0PQLc+Ecg1g=",
+                       "requires": {
+                               "iterate-object": "^1.1.0",
+                               "ul": "^5.0.0"
+                       }
+               },
+               "oauth-sign": {
+                       "version": "0.8.2",
+                       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+                       "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+               },
+               "obj-def": {
+                       "version": "1.0.6",
+                       "resolved": "https://registry.npmjs.org/obj-def/-/obj-def-1.0.6.tgz",
+                       "integrity": "sha1-d1ThcohJwvk00f3SvnL+Yn7LWxQ=",
+                       "requires": {
+                               "deffy": "^2.2.2"
+                       }
+               },
+               "object-assign": {
+                       "version": "4.1.1",
+                       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+                       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "object-component": {
                        "version": "0.0.3",
                                "wrappy": "1"
                        }
                },
++<<<<<<< HEAD
++=======
+               "one-by-one": {
+                       "version": "3.2.6",
+                       "resolved": "https://registry.npmjs.org/one-by-one/-/one-by-one-3.2.6.tgz",
+                       "integrity": "sha1-M+Pelthw+alL3LY/ontRcAvhESs=",
+                       "requires": {
+                               "obj-def": "^1.0.0",
+                               "sliced": "^1.0.1"
+                       }
+               },
+               "os-tmpdir": {
+                       "version": "1.0.2",
+                       "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+                       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+               },
+               "package-json": {
+                       "version": "2.4.0",
+                       "resolved": "http://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
+                       "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
+                       "requires": {
+                               "got": "^5.0.0",
+                               "registry-auth-token": "^3.0.1",
+                               "registry-url": "^3.0.3",
+                               "semver": "^5.1.0"
+                       }
+               },
+               "package-json-path": {
+                       "version": "1.0.7",
+                       "resolved": "https://registry.npmjs.org/package-json-path/-/package-json-path-1.0.7.tgz",
+                       "integrity": "sha1-wleQnEcBqbNfzjAwZNTOmISJ3S0=",
+                       "requires": {
+                               "abs": "^1.2.1"
+                       }
+               },
+               "package.json": {
+                       "version": "2.0.1",
+                       "resolved": "https://registry.npmjs.org/package.json/-/package.json-2.0.1.tgz",
+                       "integrity": "sha1-+IYFnSpJ7QduZIg2ldc7K0bSHW0=",
+                       "requires": {
+                               "git-package-json": "^1.4.0",
+                               "git-source": "^1.1.0",
+                               "package-json": "^2.3.1"
+                       }
+               },
+               "parse-json": {
+                       "version": "2.2.0",
+                       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+                       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+                       "requires": {
+                               "error-ex": "^1.2.0"
+                       }
+               },
+               "parse-url": {
+                       "version": "1.3.11",
+                       "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-1.3.11.tgz",
+                       "integrity": "sha1-V8FUKKuKiSsfQ4aWRccR0OFEtVQ=",
+                       "requires": {
+                               "is-ssh": "^1.3.0",
+                               "protocols": "^1.4.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "parseqs": {
                        "version": "0.0.5",
                        "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
                        "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
                        "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
                },
++<<<<<<< HEAD
++=======
+               "pinkie": {
+                       "version": "2.0.4",
+                       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+                       "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+               },
+               "pinkie-promise": {
+                       "version": "2.0.1",
+                       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+                       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+                       "requires": {
+                               "pinkie": "^2.0.0"
+                       }
+               },
+               "prepend-http": {
+                       "version": "1.0.4",
+                       "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+                       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "process-nextick-args": {
                        "version": "2.0.0",
                        "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
                        "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
                },
++<<<<<<< HEAD
++=======
+               "protocols": {
+                       "version": "1.4.6",
+                       "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.6.tgz",
+                       "integrity": "sha1-+LsmPqG1/Xp2BNJri+Ob13Z4v4o="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "proxy-addr": {
                        "version": "2.0.4",
                        "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
                                "ipaddr.js": "1.8.0"
                        }
                },
++<<<<<<< HEAD
 +              "psl": {
 +                      "version": "1.1.31",
 +                      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
 +                      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
 +              },
 +              "punycode": {
 +                      "version": "2.1.1",
 +                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 +                      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
++=======
+               "punycode": {
+                       "version": "1.4.1",
+                       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+                       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "pupa": {
                        "version": "1.0.0",
                                "inherits": "~2.0.3"
                        }
                },
++<<<<<<< HEAD
++=======
+               "r-json": {
+                       "version": "1.2.8",
+                       "resolved": "https://registry.npmjs.org/r-json/-/r-json-1.2.8.tgz",
+                       "integrity": "sha1-dEBWDMHt8AudjZT6MLytfd6U6uI="
+               },
+               "r-package-json": {
+                       "version": "1.0.7",
+                       "resolved": "https://registry.npmjs.org/r-package-json/-/r-package-json-1.0.7.tgz",
+                       "integrity": "sha512-OCIwYDX4ZUpYr+CJb78ZlN+R52Lwul2+e4eqewExCsx6L+2Um/3A+TqdFPKm9HMON/sqiK9GlLAjuFIX3v2fYQ==",
+                       "requires": {
+                               "package-json-path": "^1.0.0",
+                               "r-json": "^1.2.1"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "range-parser": {
                        "version": "1.2.0",
                        "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
                                "unpipe": "1.0.0"
                        }
                },
++<<<<<<< HEAD
 +              "readable-stream": {
 +                      "version": "2.3.6",
 +                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
++=======
+               "rc": {
+                       "version": "1.2.8",
+                       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+                       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+                       "requires": {
+                               "deep-extend": "^0.6.0",
+                               "ini": "~1.3.0",
+                               "minimist": "^1.2.0",
+                               "strip-json-comments": "~2.0.1"
+                       },
+                       "dependencies": {
+                               "minimist": {
+                                       "version": "1.2.0",
+                                       "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+                                       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+                               }
+                       }
+               },
+               "read-all-stream": {
+                       "version": "3.1.0",
+                       "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+                       "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
+                       "requires": {
+                               "pinkie-promise": "^2.0.0",
+                               "readable-stream": "^2.0.0"
+                       }
+               },
+               "readable-stream": {
+                       "version": "2.3.6",
+                       "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
                        "requires": {
                                "core-util-is": "~1.0.0",
                                "safe-buffer": "~5.1.1",
                                "string_decoder": "~1.1.1",
                                "util-deprecate": "~1.0.1"
++<<<<<<< HEAD
 +                      },
 +                      "dependencies": {
 +                              "isarray": {
 +                                      "version": "1.0.0",
 +                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 +                                      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 +                              }
 +                      }
 +              },
 +              "request": {
 +                      "version": "2.88.0",
 +                      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
 +                      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
 +                      "requires": {
 +                              "aws-sign2": "~0.7.0",
 +                              "aws4": "^1.8.0",
 +                              "caseless": "~0.12.0",
 +                              "combined-stream": "~1.0.6",
 +                              "extend": "~3.0.2",
 +                              "forever-agent": "~0.6.1",
 +                              "form-data": "~2.3.2",
 +                              "har-validator": "~5.1.0",
++=======
+                       }
+               },
+               "registry-auth-token": {
+                       "version": "3.3.2",
+                       "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
+                       "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+                       "requires": {
+                               "rc": "^1.1.6",
+                               "safe-buffer": "^5.0.1"
+                       }
+               },
+               "registry-url": {
+                       "version": "3.1.0",
+                       "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+                       "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+                       "requires": {
+                               "rc": "^1.0.1"
+                       }
+               },
+               "request": {
+                       "version": "2.87.0",
+                       "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+                       "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+                       "requires": {
+                               "aws-sign2": "~0.7.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.3.1",
+                               "har-validator": "~5.0.3",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "http-signature": "~1.2.0",
                                "is-typedarray": "~1.0.0",
                                "isstream": "~0.1.2",
                                "json-stringify-safe": "~5.0.1",
++<<<<<<< HEAD
 +                              "mime-types": "~2.1.19",
 +                              "oauth-sign": "~0.9.0",
 +                              "performance-now": "^2.1.0",
 +                              "qs": "~6.5.2",
 +                              "safe-buffer": "^5.1.2",
 +                              "tough-cookie": "~2.4.3",
 +                              "tunnel-agent": "^0.6.0",
 +                              "uuid": "^3.3.2"
 +                      }
 +              },
 +              "request-promise": {
 +                      "version": "4.2.2",
 +                      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.2.tgz",
 +                      "integrity": "sha1-0epG1lSm7k+O5qT+oQGMIpEZBLQ=",
 +                      "requires": {
 +                              "bluebird": "^3.5.0",
 +                              "request-promise-core": "1.1.1",
 +                              "stealthy-require": "^1.1.0",
 +                              "tough-cookie": ">=2.3.3"
 +                      }
 +              },
 +              "request-promise-core": {
 +                      "version": "1.1.1",
 +                      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
 +                      "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
 +                      "requires": {
 +                              "lodash": "^4.13.1"
++=======
+                               "mime-types": "~2.1.17",
+                               "oauth-sign": "~0.8.2",
+                               "performance-now": "^2.1.0",
+                               "qs": "~6.5.1",
+                               "safe-buffer": "^5.1.1",
+                               "tough-cookie": "~2.3.3",
+                               "tunnel-agent": "^0.6.0",
+                               "uuid": "^3.1.0"
+                       }
+               },
+               "requestretry": {
+                       "version": "2.0.0",
+                       "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-2.0.0.tgz",
+                       "integrity": "sha512-8nXedDVOtEENVl3WEpxgfv41P8t/uW80v6mudpCRK4+zx407V66VNxe+W6Hhd+0T5xcOthGajvfAzbuVX5WX/w==",
+                       "requires": {
+                               "extend": "^3.0.0",
+                               "lodash": "^4.15.0",
+                               "when": "^3.7.7"
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        }
                },
                "rimraf": {
                        "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
                        "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
                },
++<<<<<<< HEAD
++=======
+               "semver": {
+                       "version": "5.6.0",
+                       "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+                       "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "send": {
                        "version": "0.16.2",
                        "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
                                "statuses": "~1.4.0"
                        }
                },
++<<<<<<< HEAD
 +              "sequential-task-queue": {
 +                      "version": "1.2.1",
 +                      "resolved": "https://registry.npmjs.org/sequential-task-queue/-/sequential-task-queue-1.2.1.tgz",
 +                      "integrity": "sha512-w2g0QgV37MSsI/qnvn8Z3NUGNilQA6p+NfujkSWI99rvBu/eTx3E0Z1rTIzaRxQj+gT9+Mta2azxyefnw0C25Q=="
 +              },
++=======
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "serve-static": {
                        "version": "1.13.2",
                        "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
                        "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
                        "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
                },
++<<<<<<< HEAD
++=======
+               "sliced": {
+                       "version": "1.0.1",
+                       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+                       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "socket.io": {
                        "version": "2.1.1",
                        "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
                },
                "socket.io-parser": {
                        "version": "3.2.0",
++<<<<<<< HEAD
 +                      "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
++=======
+                       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
                        "requires": {
                                "component-emitter": "1.2.1",
                                        "requires": {
                                                "ms": "2.0.0"
                                        }
++<<<<<<< HEAD
++=======
+                               },
+                               "isarray": {
+                                       "version": "2.0.1",
+                                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+                                       "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                }
                        }
                },
                                "sort-keys": "^1.0.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "spdx-correct": {
+                       "version": "3.1.0",
+                       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+                       "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+                       "requires": {
+                               "spdx-expression-parse": "^3.0.0",
+                               "spdx-license-ids": "^3.0.0"
+                       }
+               },
+               "spdx-exceptions": {
+                       "version": "2.2.0",
+                       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+                       "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+               },
+               "spdx-expression-parse": {
+                       "version": "3.0.0",
+                       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+                       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+                       "requires": {
+                               "spdx-exceptions": "^2.1.0",
+                               "spdx-license-ids": "^3.0.0"
+                       }
+               },
+               "spdx-license-ids": {
+                       "version": "3.0.3",
+                       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
+                       "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "spotify-web-api-node": {
                        "version": "4.0.0",
                        "resolved": "https://registry.npmjs.org/spotify-web-api-node/-/spotify-web-api-node-4.0.0.tgz",
                        "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
                        "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
                },
++<<<<<<< HEAD
 +              "stealthy-require": {
 +                      "version": "1.1.1",
 +                      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
 +                      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
 +              },
 +              "string_decoder": {
 +                      "version": "1.1.1",
 +                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++=======
+               "string_decoder": {
+                       "version": "1.1.1",
+                       "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
                        "requires": {
                                "safe-buffer": "~5.1.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "strip-json-comments": {
+                       "version": "2.0.1",
+                       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+                       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "superagent": {
                        "version": "3.8.3",
                        "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz",
                                }
                        }
                },
++<<<<<<< HEAD
++=======
+               "timed-out": {
+                       "version": "3.1.3",
+                       "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
+                       "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
+               },
+               "tmp": {
+                       "version": "0.0.28",
+                       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
+                       "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
+                       "requires": {
+                               "os-tmpdir": "~1.0.1"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "to-array": {
                        "version": "0.1.4",
                        "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
                        "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
                },
                "tough-cookie": {
++<<<<<<< HEAD
 +                      "version": "2.4.3",
 +                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
 +                      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
 +                      "requires": {
 +                              "psl": "^1.1.24",
 +                              "punycode": "^1.4.1"
 +                      },
 +                      "dependencies": {
 +                              "punycode": {
 +                                      "version": "1.4.1",
 +                                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
 +                                      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
 +                              }
++=======
+                       "version": "2.3.4",
+                       "resolved": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+                       "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+                       "requires": {
+                               "punycode": "^1.4.1"
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        }
                },
                "tunnel-agent": {
                                "mime-types": "~2.1.18"
                        }
                },
++<<<<<<< HEAD
++=======
+               "typpy": {
+                       "version": "2.3.10",
+                       "resolved": "https://registry.npmjs.org/typpy/-/typpy-2.3.10.tgz",
+                       "integrity": "sha512-DKiSmYeXF4q+K0H999sVROLjwsngad5AloblLo72No+xVT9W09ytUIOCC/3puHsf+Dsf8M2hoPds0H1HwJgQqg==",
+                       "requires": {
+                               "function.name": "^1.0.3"
+                       }
+               },
+               "ul": {
+                       "version": "5.2.13",
+                       "resolved": "https://registry.npmjs.org/ul/-/ul-5.2.13.tgz",
+                       "integrity": "sha1-n/BQTqNcofdMC/WeZIDe8Am617U=",
+                       "requires": {
+                               "deffy": "^2.2.2",
+                               "typpy": "^2.3.4"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "ultron": {
                        "version": "1.1.1",
                        "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
                                "path-exists": "^3.0.0"
                        }
                },
++<<<<<<< HEAD
 +              "uri-js": {
 +                      "version": "4.2.2",
 +                      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
 +                      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
 +                      "requires": {
 +                              "punycode": "^2.1.0"
++=======
+               "unzip-response": {
+                       "version": "1.0.2",
+                       "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+                       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
+               },
+               "url-parse-lax": {
+                       "version": "1.0.0",
+                       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+                       "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+                       "requires": {
+                               "prepend-http": "^1.0.1"
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        }
                },
                "util-deprecate": {
                        "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
                        "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
                },
++<<<<<<< HEAD
++=======
+               "validate-npm-package-license": {
+                       "version": "3.0.4",
+                       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+                       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+                       "requires": {
+                               "spdx-correct": "^3.0.0",
+                               "spdx-expression-parse": "^3.0.0"
+                       }
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "vary": {
                        "version": "1.1.2",
                        "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
                                "extsprintf": "^1.2.0"
                        }
                },
++<<<<<<< HEAD
++=======
+               "when": {
+                       "version": "3.7.8",
+                       "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+                       "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
+               },
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                "wrappy": {
                        "version": "1.0.2",
                        "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
index 9df16bd7c8c8b2e8ba5752e3c5147200768a8708,61ac6cc84c01061aa9d025be71ace876d32f5b7a..321051e4998cdd881dc46718a921ed1157bc22d3
                        "dev": true
                },
                "ajv": {
++<<<<<<< HEAD
 +                      "version": "6.7.0",
 +                      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz",
 +                      "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==",
++=======
+                       "version": "6.6.2",
+                       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
+                       "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "fast-deep-equal": "^2.0.1",
                        }
                },
                "app-builder-bin": {
++<<<<<<< HEAD
 +                      "version": "2.6.3",
 +                      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.3.tgz",
 +                      "integrity": "sha512-JL8C41e6yGIchFsHP/q15aGNedAaUakLhkV6ER0Yxafx08sRnlDnlkAkEIKjX7edg/4i7swpGa6CBv1zX9GgCA==",
 +                      "dev": true
 +              },
 +              "app-builder-lib": {
 +                      "version": "20.38.5",
 +                      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.38.5.tgz",
 +                      "integrity": "sha512-vVgM9d9twwlhr+8vNAJOAD9dyVBRk7reuVa1BE1OmvaHb1M+fS8KpvcDKVdBqX9KDHy7zSc57mnIcHgax4/XMA==",
 +                      "dev": true,
 +                      "requires": {
 +                              "7zip-bin": "~4.1.0",
 +                              "app-builder-bin": "2.6.3",
 +                              "async-exit-hook": "^2.0.1",
 +                              "bluebird-lst": "^1.0.6",
 +                              "builder-util": "9.6.2",
 +                              "builder-util-runtime": "8.1.1",
 +                              "chromium-pickle-js": "^0.2.0",
 +                              "debug": "^4.1.1",
 +                              "ejs": "^2.6.1",
 +                              "electron-osx-sign": "0.4.11",
 +                              "electron-publish": "20.38.5",
 +                              "fs-extra-p": "^7.0.0",
 +                              "hosted-git-info": "^2.7.1",
 +                              "is-ci": "^2.0.0",
 +                              "isbinaryfile": "^4.0.0",
 +                              "js-yaml": "^3.12.1",
++=======
+                       "version": "2.6.1",
+                       "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.1.tgz",
+                       "integrity": "sha512-W0l85O+s6lOaziWqAhszPfwiG0s15FvMBP9j9i/bknsMccUkwN60u4Cy7yYtf6akCUDuJenLqpTX4/xvkq1egw==",
+                       "dev": true
+               },
+               "app-builder-lib": {
+                       "version": "20.38.4",
+                       "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.38.4.tgz",
+                       "integrity": "sha512-JbuAJQBndcCW6BJVIb2tPjM5wiuIjz2LUlbyVxNIawM2wFKUBV9kr0N3RNBJFxcrCEuA9oprMUCoymJdrMUVfA==",
+                       "dev": true,
+                       "requires": {
+                               "7zip-bin": "~4.1.0",
+                               "app-builder-bin": "2.6.1",
+                               "async-exit-hook": "^2.0.1",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "9.6.1",
+                               "builder-util-runtime": "8.1.0",
+                               "chromium-pickle-js": "^0.2.0",
+                               "debug": "^4.1.0",
+                               "ejs": "^2.6.1",
+                               "electron-osx-sign": "0.4.11",
+                               "electron-publish": "20.38.3",
+                               "fs-extra-p": "^7.0.0",
+                               "hosted-git-info": "^2.7.1",
+                               "is-ci": "^2.0.0",
+                               "isbinaryfile": "^3.0.3",
+                               "js-yaml": "^3.12.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "lazy-val": "^1.0.3",
                                "minimatch": "^3.0.4",
                                "normalize-package-data": "^2.4.0",
                                "plist": "^3.0.1",
++<<<<<<< HEAD
 +                              "read-config-file": "3.2.1",
++=======
+                               "read-config-file": "3.2.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "sanitize-filename": "^1.6.1",
                                "semver": "^5.6.0",
                                "temp-file": "^3.3.2"
                        "dev": true
                },
                "builder-util": {
++<<<<<<< HEAD
 +                      "version": "9.6.2",
 +                      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.6.2.tgz",
 +                      "integrity": "sha512-cWl/0/Q851lesMmXp1IjreeAX1QAWA9e+iU2IT61oh+CvMYJnDwao2m9ZCHammdw2zllrwWu4fOC3gvsb/yOCw==",
 +                      "dev": true,
 +                      "requires": {
 +                              "7zip-bin": "~4.1.0",
 +                              "app-builder-bin": "2.6.3",
 +                              "bluebird-lst": "^1.0.6",
 +                              "builder-util-runtime": "^8.1.1",
 +                              "chalk": "^2.4.2",
 +                              "debug": "^4.1.1",
 +                              "fs-extra-p": "^7.0.0",
 +                              "is-ci": "^2.0.0",
 +                              "js-yaml": "^3.12.1",
 +                              "source-map-support": "^0.5.10",
++=======
+                       "version": "9.6.1",
+                       "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.6.1.tgz",
+                       "integrity": "sha512-8MljKTjeV+A+LLVexuWEV3EpWbiUcsHHrB4Bg2qNo/3dC+vTo6g/27+W3Ij7Ij1UTobSkNBstFieWijXJCco9A==",
+                       "dev": true,
+                       "requires": {
+                               "7zip-bin": "~4.1.0",
+                               "app-builder-bin": "2.6.1",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util-runtime": "^8.1.0",
+                               "chalk": "^2.4.1",
+                               "debug": "^4.1.0",
+                               "fs-extra-p": "^7.0.0",
+                               "is-ci": "^2.0.0",
+                               "js-yaml": "^3.12.0",
+                               "source-map-support": "^0.5.9",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "stat-mode": "^0.2.2",
                                "temp-file": "^3.3.2"
                        },
                        }
                },
                "builder-util-runtime": {
++<<<<<<< HEAD
 +                      "version": "8.1.1",
 +                      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz",
 +                      "integrity": "sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==",
 +                      "dev": true,
 +                      "requires": {
 +                              "bluebird-lst": "^1.0.6",
 +                              "debug": "^4.1.1",
++=======
+                       "version": "8.1.0",
+                       "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz",
+                       "integrity": "sha512-s1mlJ28mv+56Iebh6c9aXjVe11O3Z0cDTwAGeB0PCcUzHA37fDxGgS8ZGoYNMZP+rBHj21d/od1wuYofTVLaQg==",
+                       "dev": true,
+                       "requires": {
+                               "bluebird-lst": "^1.0.6",
+                               "debug": "^4.1.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "fs-extra-p": "^7.0.0",
                                "sax": "^1.2.4"
                        },
                },
                "camelcase-keys": {
                        "version": "2.1.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
                        "dev": true,
                        "requires": {
                        "dev": true
                },
                "chalk": {
++<<<<<<< HEAD
 +                      "version": "2.4.2",
 +                      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 +                      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
++=======
+                       "version": "2.4.1",
+                       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                       "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "ansi-styles": "^3.2.1",
                },
                "concat-stream": {
                        "version": "1.6.2",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
                        "dev": true,
                        "requires": {
                                },
                                "readable-stream": {
                                        "version": "2.3.6",
++<<<<<<< HEAD
 +                                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
++=======
+                                       "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
                                        "dev": true,
                                        "requires": {
                                },
                                "string_decoder": {
                                        "version": "1.1.1",
++<<<<<<< HEAD
 +                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++=======
+                                       "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
                                        "dev": true,
                                        "requires": {
                        "dev": true
                },
                "dmg-builder": {
++<<<<<<< HEAD
 +                      "version": "6.5.4",
 +                      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.5.4.tgz",
 +                      "integrity": "sha512-EaEkF8weXez3iAwgYffjcYfumauUh5x+BggMgn/IuihNIA5/WfzRAUR4wMq9aII2zwArlw+rIrX6ZHKbmtkQmA==",
 +                      "dev": true,
 +                      "requires": {
 +                              "app-builder-lib": "~20.38.5",
 +                              "bluebird-lst": "^1.0.6",
 +                              "builder-util": "~9.6.2",
 +                              "fs-extra-p": "^7.0.0",
 +                              "iconv-lite": "^0.4.24",
 +                              "js-yaml": "^3.12.1",
++=======
+                       "version": "6.5.3",
+                       "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.5.3.tgz",
+                       "integrity": "sha512-ZNl4GFBg6rdFplnuoK56iftxh/qgM7rXJUxgl21eK4WsjxgQwtQ0REZo+pDSL4OzVeyOO8MMNWSNQcCsBLiDyA==",
+                       "dev": true,
+                       "requires": {
+                               "app-builder-lib": "~20.38.3",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "~9.6.0",
+                               "fs-extra-p": "^7.0.0",
+                               "iconv-lite": "^0.4.24",
+                               "js-yaml": "^3.12.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "parse-color": "^1.0.0",
                                "sanitize-filename": "^1.6.1"
                        }
                        "dev": true
                },
                "electron": {
++<<<<<<< HEAD
 +                      "version": "3.0.10",
 +                      "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.10.tgz",
 +                      "integrity": "sha512-I39IeQP3NOlbjKzTDK8uK2JdiHDfhV5SruCS2Gttkn2MaKCY+yIzQ6Wr4DyBXLeTEkL1sbZxbqQVhCavAliv5w==",
++=======
+                       "version": "3.0.13",
+                       "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.13.tgz",
+                       "integrity": "sha512-tfx5jFgXhCmpe6oPjcesaRj7geHqQxrJdbpseanRzL9BbyYUtsj0HoxwPAUvCx4+52P6XryBwWTvne/1eBVf9Q==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "@types/node": "^8.0.24",
                        }
                },
                "electron-builder": {
++<<<<<<< HEAD
 +                      "version": "20.38.5",
 +                      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.38.5.tgz",
 +                      "integrity": "sha512-p88IDHhH2J4hA6KwRBJY+OfVZuFtFIShY3Uh/TwYAfbX0v1RhKZytuGdO8sty2zcWxDYX74xDBv+X9oN6qEIRQ==",
 +                      "dev": true,
 +                      "requires": {
 +                              "app-builder-lib": "20.38.5",
 +                              "bluebird-lst": "^1.0.6",
 +                              "builder-util": "9.6.2",
 +                              "builder-util-runtime": "8.1.1",
 +                              "chalk": "^2.4.2",
 +                              "dmg-builder": "6.5.4",
 +                              "fs-extra-p": "^7.0.0",
 +                              "is-ci": "^2.0.0",
 +                              "lazy-val": "^1.0.3",
 +                              "read-config-file": "3.2.1",
++=======
+                       "version": "20.38.4",
+                       "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.38.4.tgz",
+                       "integrity": "sha512-WHOr3Rz2wktxV5TqmRL6woO9/wrIZeRfJPSEXOhgfgLskE5Sp2Aer0zAF7lHNqXuG6JhU+0I9IYFAxa73MTs9w==",
+                       "dev": true,
+                       "requires": {
+                               "app-builder-lib": "20.38.4",
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "9.6.1",
+                               "builder-util-runtime": "8.1.0",
+                               "chalk": "^2.4.1",
+                               "dmg-builder": "6.5.3",
+                               "fs-extra-p": "^7.0.0",
+                               "is-ci": "^2.0.0",
+                               "lazy-val": "^1.0.3",
+                               "read-config-file": "3.2.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "sanitize-filename": "^1.6.1",
                                "update-notifier": "^2.5.0",
                                "yargs": "^12.0.5"
                                                "ms": "2.0.0"
                                        }
                                },
++<<<<<<< HEAD
 +                              "isbinaryfile": {
 +                                      "version": "3.0.3",
 +                                      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
 +                                      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
 +                                      "dev": true,
 +                                      "requires": {
 +                                              "buffer-alloc": "^1.2.0"
 +                                      }
 +                              },
++=======
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "ms": {
                                        "version": "2.0.0",
                                        "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
                        }
                },
                "electron-publish": {
++<<<<<<< HEAD
 +                      "version": "20.38.5",
 +                      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.38.5.tgz",
 +                      "integrity": "sha512-EhdPm6t0nKDfa0r3KjV1kSFcz03VrzgJRv7v5nHkkpQZB6OSmDNlHq7k66NBwQhPK3i4CK+uvehljZAP28vbCA==",
 +                      "dev": true,
 +                      "requires": {
 +                              "bluebird-lst": "^1.0.6",
 +                              "builder-util": "~9.6.2",
 +                              "builder-util-runtime": "^8.1.1",
 +                              "chalk": "^2.4.2",
++=======
+                       "version": "20.38.3",
+                       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.38.3.tgz",
+                       "integrity": "sha512-Qomq253NT5DfjUZgFSx6p+gheU5YhM6zZ67fTtBZvwyk0v8HwxNXfa8fZT7h+1c3BwEmjusTbmjZRNW/XZBXFA==",
+                       "dev": true,
+                       "requires": {
+                               "bluebird-lst": "^1.0.6",
+                               "builder-util": "~9.6.0",
+                               "builder-util-runtime": "^8.1.0",
+                               "chalk": "^2.4.1",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "fs-extra-p": "^7.0.0",
                                "lazy-val": "^1.0.3",
                                "mime": "^2.4.0"
                },
                "get-stream": {
                        "version": "3.0.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
                        "dev": true
                },
                },
                "got": {
                        "version": "6.7.1",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
                        "dev": true,
                        "requires": {
                },
                "is-builtin-module": {
                        "version": "1.0.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
                        "dev": true,
                        "requires": {
                },
                "is-obj": {
                        "version": "1.0.1",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
                        "dev": true
                },
                        "dev": true
                },
                "isbinaryfile": {
++<<<<<<< HEAD
 +                      "version": "4.0.0",
 +                      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.0.tgz",
 +                      "integrity": "sha512-RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA==",
 +                      "dev": true
++=======
+                       "version": "3.0.3",
+                       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+                       "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+                       "dev": true,
+                       "requires": {
+                               "buffer-alloc": "^1.2.0"
+                       }
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                },
                "isexe": {
                        "version": "2.0.0",
                        "dev": true
                },
                "js-yaml": {
++<<<<<<< HEAD
 +                      "version": "3.12.1",
 +                      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
 +                      "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
++=======
+                       "version": "3.12.0",
+                       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+                       "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "argparse": "^1.0.7",
                },
                "load-json-file": {
                        "version": "1.1.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
                        "dev": true,
                        "requires": {
                },
                "meow": {
                        "version": "3.7.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
                        "dev": true,
                        "requires": {
                },
                "minimist": {
                        "version": "1.2.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
                        "dev": true
                },
                "mkdirp": {
                        "version": "0.5.1",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
                        "dev": true,
                        "requires": {
                        "dependencies": {
                                "minimist": {
                                        "version": "0.0.8",
++<<<<<<< HEAD
 +                                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
++=======
+                                       "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
                                        "dev": true
                                }
                },
                "p-is-promise": {
                        "version": "1.1.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
                        "dev": true
                },
                        "dependencies": {
                                "color-convert": {
                                        "version": "0.5.3",
++<<<<<<< HEAD
 +                                      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
++=======
+                                       "resolved": "http://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                        "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
                                        "dev": true
                                }
                },
                "pify": {
                        "version": "2.3.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
                        "dev": true
                },
                },
                "pretty-bytes": {
                        "version": "1.0.4",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
                        "dev": true,
                        "requires": {
                        }
                },
                "read-config-file": {
++<<<<<<< HEAD
 +                      "version": "3.2.1",
 +                      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.1.tgz",
 +                      "integrity": "sha512-yW4hZZXdNN+Paij5JVAiTv1lUsAN5QRBU5NqotQqwYdVkUczSmDzm66VLu0eojiZt2zFeYptTFDAYlalDGuHdA==",
 +                      "dev": true,
 +                      "requires": {
 +                              "ajv": "^6.7.0",
 +                              "ajv-keywords": "^3.2.0",
 +                              "bluebird-lst": "^1.0.6",
 +                              "dotenv": "^6.2.0",
 +                              "dotenv-expand": "^4.2.0",
 +                              "fs-extra-p": "^7.0.0",
 +                              "js-yaml": "^3.12.1",
++=======
+                       "version": "3.2.0",
+                       "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.0.tgz",
+                       "integrity": "sha512-i1QRc5jy4sHm9YBGb6ArA5SU1mDrc5wu2mnm3r9gPnm+LVZhBGbpTCKqAXyvV4TJHnBR3Yaaww+9b3DyRZcfww==",
+                       "dev": true,
+                       "requires": {
+                               "ajv": "^6.5.5",
+                               "ajv-keywords": "^3.2.0",
+                               "bluebird-lst": "^1.0.6",
+                               "dotenv": "^6.1.0",
+                               "dotenv-expand": "^4.2.0",
+                               "fs-extra-p": "^7.0.0",
+                               "js-yaml": "^3.12.0",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                                "json5": "^2.1.0",
                                "lazy-val": "^1.0.3"
                        }
                },
                "readable-stream": {
                        "version": "1.1.14",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
                        "dev": true,
                        "requires": {
                        "dev": true
                },
                "source-map-support": {
++<<<<<<< HEAD
 +                      "version": "0.5.10",
 +                      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
 +                      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
++=======
+                       "version": "0.5.9",
+                       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+                       "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "dev": true,
                        "requires": {
                                "buffer-from": "^1.0.0",
                },
                "sprintf-js": {
                        "version": "1.0.3",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
                        "dev": true
                },
                },
                "string-width": {
                        "version": "1.0.2",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
                        "dev": true,
                        "requires": {
                },
                "string_decoder": {
                        "version": "0.10.31",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
                        "dev": true
                },
                "strip-ansi": {
                        "version": "3.0.1",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
                        "dev": true,
                        "requires": {
                },
                "strip-eof": {
                        "version": "1.0.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
                        "dev": true
                },
                },
                "through2": {
                        "version": "0.2.3",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
                        "dev": true,
                        "requires": {
                },
                "wrap-ansi": {
                        "version": "2.1.0",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
                        "dev": true,
                        "requires": {
                },
                "xmlbuilder": {
                        "version": "9.0.7",
++<<<<<<< HEAD
 +                      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
++=======
+                       "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
++>>>>>>> de6a72bcd839971969c98224f3c9d5d23c54d8f9
                        "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
                        "dev": true
                },