merged master to get author

NashvilleSoftwareSchool · Nov 6, 2012 · 3baff56 · 3baff56
1 parent 2644a8c
commit 3baff56
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@
 /tmp
 
 config/database.yml
+features/.DS_Store