Merge pull request #631 from cmurphy/master

Morgan Haskel · Morgan Haskel · commit efeb01cee62f · 2014-12-29T11:22:49.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
