Merge branch 'develop'

ccd-utexas · Apr 19, 2015 · 4539e04 · 4539e04
2 parents b9207bb + ee27a4e
commit 4539e04
Show file tree

Hide file tree

Showing 2 changed files with 1,679 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,9 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Emacs
+*~
+
+# IPython Notebooks
+*/.ipynb_checkpoints/*