Merge branch 'master' of github.com:etaypere/resors

Conflicts: .gitignore README.md
eyy · Apr 30, 2013 · 7ba71f2 · 7ba71f2
2 parents a454f5f + 36b24ee
commit 7ba71f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,16 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
 /node_modules
 /.idea
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
 Resors
 =====
 
-Resources for Mongoose. Check `\example` for now.
+Resources for Mongoose. Check `\example`.