diff --git a/Gemfile.lock b/Gemfile.lock
index a425a564..0fd7d18e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,11 +18,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-<<<<<<< HEAD
-    aasm (3.0.20)
-=======
     aasm (3.0.22)
->>>>>>> master
     actionmailer (4.0.0)
       actionpack (= 4.0.0)
       mail (~> 2.5.3)
@@ -50,15 +46,7 @@ GEM
     acts_as_list (0.3.0)
       activerecord (>= 3.0)
     arel (4.0.0)
-<<<<<<< HEAD
-    aruba (0.5.3)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    atomic (1.1.12)
-=======
     atomic (1.1.14)
->>>>>>> master
     bcrypt-ruby (3.0.1)
     builder (3.1.4)
     bullet (4.6.0)
@@ -74,7 +62,7 @@ GEM
       xpath (~> 2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.0.11)
+    codeclimate-test-reporter (0.1.1)
       simplecov (>= 0.7.1, < 1.0.0)
     coffee-rails (4.0.0)
       coffee-script (>= 2.2.0)
@@ -83,12 +71,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-<<<<<<< HEAD
-    commonjs (0.2.6)
-    cucumber (1.3.6)
-=======
+    commonjs (0.2.7)
     cucumber (1.3.8)
->>>>>>> master
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.1)
@@ -98,10 +82,7 @@ GEM
       capybara (>= 1.1.2)
       cucumber (>= 1.2.0)
       nokogiri (>= 1.5.0)
-<<<<<<< HEAD
-=======
       rails (>= 3.0.0)
->>>>>>> master
     database_cleaner (1.1.1)
     diff-lcs (1.2.4)
     erubis (2.7.0)
@@ -121,16 +102,12 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-<<<<<<< HEAD
-    less (2.3.2)
-      commonjs (~> 0.2.6)
-    less-rails (2.3.3)
+    less (2.4.0)
+      commonjs (~> 0.2.7)
+    less-rails (2.4.2)
       actionpack (>= 3.1)
-      less (~> 2.3.1)
-    libv8 (3.11.8.17)
-=======
+      less (~> 2.4.0)
     libv8 (3.16.14.3)
->>>>>>> master
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -140,23 +117,15 @@ GEM
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-<<<<<<< HEAD
-    mousetrap-rails (0.0.11)
-    multi_json (1.7.8)
-=======
+    mousetrap-rails (0.0.12)
     multi_json (1.8.0)
->>>>>>> master
     multi_test (0.0.2)
     mysql2 (0.3.13)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     rack (1.5.2)
-<<<<<<< HEAD
-    rack-mini-profiler (0.1.28)
-=======
     rack-mini-profiler (0.1.31)
->>>>>>> master
       rack (>= 1.1.3)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -168,7 +137,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.0)
       sprockets-rails (~> 2.0.0)
-    rails_autolink (1.1.3)
+    rails_autolink (1.1.4)
       rails (> 3.1)
     railties (4.0.0)
       actionpack (= 4.0.0)
@@ -177,17 +146,10 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
     ref (1.0.5)
-<<<<<<< HEAD
-    rspec-expectations (2.14.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rubyzip (0.9.9)
-    safe_yaml (0.9.5)
-=======
     rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rubyzip (0.9.9)
     safe_yaml (0.9.7)
->>>>>>> master
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
     sass (3.2.10)
@@ -195,11 +157,7 @@ GEM
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-<<<<<<< HEAD
-    selenium-webdriver (2.34.0)
-=======
     selenium-webdriver (2.35.1)
->>>>>>> master
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip (< 1.0.0)
@@ -248,13 +206,9 @@ GEM
       multi_json (~> 1.0, >= 1.0.2)
     uniform_notifier (1.3.0)
     websocket (1.0.7)
-<<<<<<< HEAD
-    will_paginate (3.0.4)
-    will_paginate-bootstrap (0.2.3)
-      will_paginate (>= 3.0.3)
-=======
     will_paginate (3.0.5)
->>>>>>> master
+    will_paginate-bootstrap (0.2.5)
+      will_paginate (>= 3.0.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.8.7.2)