From ae05044a7474ecf60c813017a0a539569df94b6e Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Tue, 5 May 2015 13:28:25 +0000
Subject: [PATCH] removed rails-sass

---
 Gemfile      |  3 +--
 Gemfile.lock | 18 +++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 37bcb5b..bc48769 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,7 @@ ruby '2.2.0'
 gem 'rails', '4.2.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', :group => :development
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
diff --git a/Gemfile.lock b/Gemfile.lock
index e9ee06b..6ad142d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,6 @@ GEM
     execjs (2.5.2)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     i18n (0.7.0)
     jbuilder (2.2.13)
       activesupport (>= 3.0.0, < 5)
@@ -130,21 +129,19 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     round_robin_tournament (0.0.1)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    sass (3.4.13)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
     spring (1.3.5)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.0.3)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -181,7 +178,6 @@ DEPENDENCIES
   rails_12factor
   rb-readline
   round_robin_tournament
-  sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   spring
   sqlite3