From 8425a001edbe2f438fee61a073520bf59995b244 Mon Sep 17 00:00:00 2001
From: shchmue <shchmue@gmail.com>
Date: Mon, 25 Mar 2019 17:56:56 -0400
Subject: [PATCH] Add .gitignore

---
 .gitignore | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2e51a97..bed0972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
+<<<<<<< HEAD
 build/
-output/
\ No newline at end of file
+output/
+=======
+.vscode
+build
+output
+research
+>>>>>>> Add .gitignore