diff --git a/.gitignore b/.gitignore
index 4c5e3f1..737e7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,57 @@
+<<<<<<< HEAD
 /node_modules
-/done_urls_&_sites.md
\ No newline at end of file
+/done_urls_&_sites.md
+=======
+### https://raw.github.com/github/gitignore/5d896f6791c4257b74696714c66b2530b8d95a51/Node.gitignore
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+# Coverage directory used by tools like istanbul
+coverage
+# nyc test coverage
+.nyc_output
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+# Bower dependency directory (https://bower.io/)
+bower_components
+# node-waf configuration
+.lock-wscript
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+# Dependency directories
+node_modules/
+jspm_packages/
+# Typescript v1 declaration files
+typings/
+# Optional npm cache directory
+.npm
+# Optional eslint cache
+.eslintcache
+# Optional REPL history
+.node_repl_history
+# Output of 'npm pack'
+*.tgz
+# Yarn Integrity file
+.yarn-integrity
+# dotenv environment variables file
+.env
+# Custom
+dist/
+~*
+.idea
+.awcache
+.vscode
+.rts2_cache_*
+.stryker-tmp
+reports
+>>>>>>> a4f4843014a71225dae92b12d90964d210b7c3f6