update .gitignore, gemfile

asonix · asonix · commit d478558ed83e · 2015-09-26T22:41:36.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,9 @@
 /log/*
 !/log/.keep
 /tmp
+
+# Ignore gems
+/bundle/install
+
+# Ignore swap files
+*.sw?
diff --git a/Gemfile b/Gemfile
@@ -32,6 +32,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
+gem 'json'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -143,6 +143,7 @@ DEPENDENCIES
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jquery-rails
+  json
   rails (= 4.2.4)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
