Intermediary commit in merging branch 'master' of https://github.com/RelaxedJS/ReLaXed

Author: Zulko

.gitignore

@@ -78,3 +78,5 @@ package-lock.json
 # VS code
 .vscode
 .eslintrc.*
+
+*.local.bak

package.json

@@ -20,7 +20,11 @@
     "colors": "^1.2.3",
     "commander": "^2.15.1",
     "csvtojson": "^1.1.9",
+<<<<<<< HEAD
     "filesize": "^3.6.1",
+=======
+    "deptree": "^1.0.0",
+>>>>>>> 11a0fa3752ba10c6fd0510b7994e3eab75e91b0f
     "html2jade": "^0.8.6",
     "jimp": "^0.2.28",
     "jstransformer-highlight": "^1.0.1",
@@ -32,7 +36,11 @@
     "pug": "^2.0.3",
     "puppeteer": "^1.3.0",
     "svgo": "^1.0.5",
+<<<<<<< HEAD
     "synchronize": "^2.0.0"
+=======
+    "yaml": "^0.3.0"
+>>>>>>> 11a0fa3752ba10c6fd0510b7994e3eab75e91b0f
   },
   "devDependencies": {
     "mocha": "^5.2.0",