Update the Main Branch from certainty

.gitignore

@@ -1,8 +1,17 @@
+<<<<<<< HEAD
+# Ignore all contents of these directories
+!**/*.py
+/Data/
+/attach/
+/results/
+/enarcelona/
+=======
 # 1. Broad Ignores
 /Data/*
 /attach/*
 /results/*
 /enarcelona/*
+>>>>>>> Certainty
 .env
 __pycache__/
 *.pyc

.gitignore.orig

@@ -0,0 +1,29 @@
+<<<<<<< HEAD
+# Ignore all contents of these directories
+!**/*.py
+/Data/
+/attach/
+/results/
+/enarcelona/
+=======
+# 1. Broad Ignores
+/Data/*
+/attach/*
+/results/*
+/enarcelona/*
+>>>>>>> Certainty
+.env
+__pycache__/
+*.pyc
+*.csv
+=======
+/reference/
+*.svg
+>>>>>>> Stashed changes
+# 2. Ignore virtual environments COMPLETELY
+# This must come BEFORE the unignore rule
+env*/
+
+# 3. The "Unignore" rule (Whitelisting)
+# We only unignore .py files that aren't already blocked by the rules above
+!**/*.py