Merge branch 'master' into ipynb-checkpoints

manavm · manavm · commit 39183fa23649 · 2015-08-10T19:02:49.000-04:00
diff --git a/Node.gitignore b/Node.gitignore
@@ -1,6 +1,7 @@
 # Logs
 logs
 *.log
+npm-debug.log*
 
 # Runtime data
 pids

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 # Logs
 logs
 *.log
 +npm-debug.log*
 # Runtime data
 pids