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 ++++++++-
 Gemfile      | 2 ++
 Gemfile.lock | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

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
diff --git a/Gemfile b/Gemfile
index 5a5be8b..5a6b98d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,6 +52,8 @@ gem 'delayed_job_active_record'
 # Mailboxer supports a messaging and alerting system.
 gem 'mailboxer'
 
+gem 'figaro'
+
 group :doc do
 	# bundle exec rake doc:rails generates the API under doc/api.
 	gem 'sdoc', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 145a7fc..2de3fea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,9 @@ GEM
       delayed_job (>= 3.0, < 4.1)
     erubis (2.7.0)
     execjs (2.0.2)
+    figaro (0.7.0)
+      bundler (~> 1.0)
+      rails (>= 3, < 5)
     foreigner (1.6.1)
       activerecord (>= 3.0.0)
     hike (1.2.3)
@@ -143,6 +146,7 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   daemons
   delayed_job_active_record
+  figaro
   httparty
   jbuilder (~> 1.2)
   jquery-rails
-- 
cgit v1.2.3