fixing Gemfile

Gemfile

@@ -55,13 +55,11 @@ gem 'jquery-rails'
 
 # Pow related gem
 gem 'powder'
-<<<<<<< HEAD
 
 gem 'aruba'
 gem 'minitest', '~> 4.0', :require=> "minitest/autorun"
-=======
+
 #gem 'minitest'
->>>>>>> adding rspec and auto test runs
 
 # Deploy with Capistrano
 # gem 'capistrano'

Gemfile.lock

@@ -159,9 +159,15 @@ GEM
     rb-fsevent (0.9.3)
     rdoc (3.12.2)
       json (~> 1.4)
+    rspec (2.14.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.2)
     rspec-core (2.14.4)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
     rspec-mocks (2.14.2)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
@@ -170,14 +176,6 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec (2.14.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.2)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
     ruby2ruby (2.0.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
@@ -237,8 +235,8 @@ DEPENDENCIES
   rack-livereload
   rails (= 3.2.13)
   rb-fsevent
-  rspec-rails
   rspec
+  rspec-rails
   sass-rails (~> 3.2.3)
   sqlite3
   uglifier (>= 1.0.3)