Merge pull request #254 from cmurphy/master

Morgan Haskel · Morgan Haskel · commit 7ed3f566c68b · 2014-12-29T11:23:37.000-08:00
Add IntelliJ files to the ignore list
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+.idea/
+*.iml
