Merge branch 'mega_merge' of https://github.com/Embedded-Systems-Spring-2020/Lab3 into mega_merge

ggasmithh · ggasmithh · commit 4a41ab7f3788 · 2020-02-17T15:10:53.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ build/
 .sconsign.dblite
 .vscode/
 templates/**/*.pyc
+__pycache__
