Merging in stutter

diff --cc .gitignore
index 6f3ae28dacb17a7e43adbc936222c37562d92bc8,6b7f3f36acd0f0ebd300349fed4f58e8fbed248e..ac7e5e057e3acd1add31594c4e440cfae72ac7d3
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,6 @@@
 -__pycache__
 +*.out
 +*.pyc
+ a.out.c
+ .env
+ *.pyc
+ *.swp