Merge branch 'master' into createoutput-referential-loop-bug

s0ph1e · s0ph1e · commit 81bc0a8d9c4a · 2016-04-29T15:22:34.000+03:00
Conflicts:
	lib/utils.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "website-scraper",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Download website to a local directory (including all css, images, js, etc.)",
   "readmeFilename": "README.md",
   "main": "index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "website-scraper",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"description": "Download website to a local directory (including all css, images, js, etc.)",`
`5`	`5`	`"readmeFilename": "README.md",`
`6`	`6`	`"main": "index.js",`