resolved conflicts

Gemfile.lock

@@ -38,8 +38,8 @@ GEM
     erubis (2.7.0)
     execjs (2.0.2)
     hike (1.2.3)
-    i18n (0.6.5)
-    jbuilder (1.5.2)
+    i18n (0.6.9)
+    jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.0.4)
@@ -52,7 +52,6 @@ GEM
     mime-types (1.25.1)
     minitest (4.7.5)
     multi_json (1.8.2)
-    oj (2.4.0)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-cors (0.2.9)
@@ -71,13 +70,11 @@ GEM
       activesupport (= 4.0.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
-    ridc (0.0.7)
-      multi_json (~> 1.8.2)
-      oj (~> 2.4.0)
-    sass (3.2.12)
+    ridc (0.0.8)
+    sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
@@ -102,10 +99,10 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.3.1)
+    turbolinks (2.1.0)
       coffee-rails
     tzinfo (0.3.38)
-    uglifier (2.3.1)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -118,7 +115,7 @@ DEPENDENCIES
   jquery-rails
   rack-cors
   rails (= 4.0.1)
-  ridc (~> 0.0.7)
+  ridc (~> 0.0.8)
   sass-rails (~> 4.0.0)
   sdoc
   sqlite3