1 files changed, 22 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 18c75b1..dd2214a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,22 @@
-Testing/*
-.DS_Store
-.vagrant/*
-.idea/
-
-CMakeFiles/
-cmake_install.cmake
-CMakeCache.txt
-Makefile
-
-src/CMakeFiles
-src/cmake_install.cmake
-src/Makefile
-
-build/*
+<<<<<<< HEAD
+Testing/*
+.DS_Store
+.vagrant/*
+.idea/
+./vscode
+CMakeFiles/
+cmake_install.cmake
+CMakeCache.txt
+Makefile
+src/CMakeFiles
+src/cmake_install.cmake
+src/Makefile
+build/*
+tests/output.txt
+tests/loggerRun
+test/output.txt
+test/loggerRun
+test/adsTest.cpp
+docs/150_VirginiaTech_TechnicalReport.pdf
+docs/Chen_Presentation_ADS.pdf
+docs/TestLaunch2-Critical.txt