Preparing for merge

Author: Bryan Parker

.gitignore

@@ -1,4 +1,31 @@
+<<<<<<< HEAD
 dist
 node_modules
 .DS_Store
 .vscode
+=======
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+>>>>>>> refactor/master

README.md

@@ -1,5 +1,8 @@
+<<<<<<< HEAD
 ![vimath logo](assets/logo.png)
 
+=======
+>>>>>>> refactor/master
 # Vimath (VIsual MATH)
 
 Vimath is a browser library for creating animatable and interactive visualizations. While it's general and flexible enough for any visualizations
@@ -31,12 +34,19 @@ class TestScene extends Scene {
             .scale(0.5);   // Scale down by 50%
 
         this.add(s, t);
+<<<<<<< HEAD
 
         return this;
     }
 }
 
 new TestScene().compose().render();
+=======
+    }
+}
+
+new TestScene().render();
+>>>>>>> refactor/master
 ```
 
 #### Output