Resolved merge issues

diff --cc Gemfile
index f677f3d2db9e7086230d0faa88ab187cbba78e09,e2958515cd6b65b577b5aa834a21553afdd756f9..804c2dc7fae9bd275dfee8cebaa091bb43faada0
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -6,8 -6,8 +6,7 @@@ source "http://rubygems.org
  # Add dependencies to develop your gem here.
  # Include everything needed to run rake, tests, features, etc.
  group :development do
-   gem "rspec"
-   gem "bundler"
-   gem "jeweler"
-   gem "rdoc"
+   gem "rspec", "~> 2.8.0"
+   gem "bundler", "~> 1.0.0"
+   gem "jeweler", "~> 1.6.2"
 -  gem "rdoc"
  end

diff --cc Gemfile.lock
Simple merge