merge

jlord · Feb 9, 2014 · 83446c9 · 83446c9
2 parents ddbb8d5 + 929ecd1
commit 83446c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules
+.DS_Store
+node_modules/
diff --git a/.npmignore b/.npmignore