From ac499ddadbae8823b4eee58187bc0f1ef9a0dc45 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sat, 26 Apr 2014 20:09:23 -0400
Subject: pull changes from master

---
 .gitignore | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 830e151..0859f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,13 @@
 /log/*.log
 /tmp
 
-# The above is from Rails.  The following is from Luke.
+# The above is from Rails.
+
+# The next lines are from `rails generate figaro:install`
+# Ignore application configuration
+/config/application.yml
+
+# The rest is from Luke.
 /vendor/bundle
 nohup.out
 # As noted above, you probably want to add the following to your global git config.
@@ -24,3 +30,4 @@ nohup.out
 *#
 .#*
 .nfs*
+.*.swp
-- 
cgit v1.2.3-2-g168b