Merge remote-tracking branch 'origin/master'

# Conflicts: # .gitignore
ctwardy · Jan 18, 2016 · 9f2d153 · 9f2d153
2 parents c476b50 + 7f7d667
commit 9f2d153
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,5 +32,7 @@ junk.py
 .idea*
 .ipynb*
 .#*
+
 ISRID*xlsx
 ISRID*csv
+