fix: merge conflicts

Author: ff6347

.gitignore

@@ -1,101 +1,74 @@
 .DS_Store
+package-lock.json
+node_modules
 test/report.txt
 .vscode
 
 # File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
-
 # Created by https://www.gitignore.io/api/jekyll,node
 # Edit at https://www.gitignore.io/?templates=jekyll,node
-
 ### Jekyll ###
 _site/
 .sass-cache/
 .jekyll-cache/
 .jekyll-metadata
-
 ### Node ###
 # 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 (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
-
 # Bower dependency directory (https://bower.io/)
 bower_components
-
 # node-waf configuration
 .lock-wscript
-
 # Compiled binary addons (https://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
 .env.test
-
 # parcel-bundler cache (https://parceljs.org/)
 .cache
-
 # next.js build output
 .next
-
 # nuxt.js build output
 .nuxt
-
 # vuepress build output
 .vuepress/dist
-
 # Serverless directories
 .serverless/
-
 # FuseBox cache
 .fusebox/
-
 # DynamoDB Local files
 .dynamodb/
-
 # End of https://www.gitignore.io/api/jekyll,node
-
-# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
-
+# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)

.vscode/settings.json

@@ -0,0 +1,29 @@
+{
+<<<<<<< HEAD
+=======
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#6ca2ee",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#c81761",
+    "activityBarBadge.foreground": "#e7e7e7",
+    "titleBar.activeBackground": "#3e85e9",
+    "titleBar.inactiveBackground": "#3e85e999",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveForeground": "#e7e7e799",
+    "statusBar.background": "#3e85e9",
+    "statusBarItem.hoverBackground": "#6ca2ee",
+    "statusBar.foreground": "#e7e7e7"
+  },
+  "peacock.color": "#3e85e9",
+  "spellright.language": [
+    "en",
+    "de"
+  ],
+  "spellright.documentTypes": [
+    "markdown",
+    "latex",
+    "plaintext"
+  ]
+>>>>>>> develop
+}

README.md

@@ -52,6 +52,8 @@ git push -u origin HEAD
 # Against the develop branch (not master).
 ```
 
+This repo holds the [site/docs for Basil.js](https://basiljs.github.io/). The current state of development (develop branch) can be found here [basiljs2.netlify.com](https://basiljs2.netlify.com/)
+
 ## Development
 
 To build these docs we are using [Webpack](https://webpack.js.org/) and [Jekyll](https://jekyllrb.com/). You need both of these to develop on this.