resolved bogus merge conflicts

Author: catmando

README.md

@@ -3,6 +3,7 @@
 [![Join the chat at https://gitter.im/zetachang/react.rb](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/zetachang/react.rb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/zetachang/react.rb.svg)](https://travis-ci.org/zetachang/react.rb)
 [![Code Climate](https://codeclimate.com/github/zetachang/react.rb/badges/gpa.svg)](https://codeclimate.com/github/zetachang/react.rb)
+[![Gem Version](https://badge.fury.io/rb/reactive-ruby.svg)](https://badge.fury.io/rb/reactive-ruby)
 
 **React.rb is an [Opal Ruby](http://opalrb.org) wrapper of
 [React.js library](http://facebook.github.io/react/)**.
@@ -59,7 +60,7 @@ In your Gemfile:
 ```ruby
 gem 'reactive-ruby'
 gem 'react-rails', '~> 1.3.2'
-gem 'opal-rails'
+gem 'opal-rails', '~> 0.8.1'
 gem 'therubyracer', platforms: :ruby # Required for prerendering
 # for JRuby you need the below line instead
 # gem 'therubyrhino, platforms: :jruby

example/examples/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.27)
-      opal
+    reactive-ruby (0.7.36)
+      opal (= 0.8.0)
       opal-activesupport (>= 0.2.0)
-      opal-browser
+      opal-browser (= 0.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -46,6 +46,7 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
+    concurrent-ruby (1.0.0)
     erubis (2.7.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
@@ -65,7 +66,7 @@ GEM
     minitest (5.8.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    opal (0.8.1)
+    opal (0.8.0)
       hike (~> 1.2)
       sourcemap (~> 0.1.0)
       sprockets (~> 3.1)
@@ -86,7 +87,7 @@ GEM
       rails (>= 3.2, < 5.0)
     opal-rspec (0.4.3)
       opal (>= 0.7.0, < 0.9)
-    paggio (0.2.5)
+    paggio (0.2.6)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -124,7 +125,8 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     sourcemap (0.1.1)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)

example/rails-tutorial/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.27)
-      opal
+    reactive-ruby (0.7.36)
+      opal (= 0.8.0)
       opal-activesupport (>= 0.2.0)
-      opal-browser
+      opal-browser (= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -60,6 +60,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
+    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
     debug_inspector (0.0.2)
     erubis (2.7.0)
@@ -87,7 +88,7 @@ GEM
     multi_json (1.11.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    opal (0.8.1)
+    opal (0.8.0)
       hike (~> 1.2)
       sourcemap (~> 0.1.0)
       sprockets (~> 3.1)
@@ -108,7 +109,7 @@ GEM
       rails (>= 3.2, < 5.0)
     opal-rspec (0.4.3)
       opal (>= 0.7.0, < 0.9)
-    paggio (0.2.5)
+    paggio (0.2.6)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -158,7 +159,8 @@ GEM
       rdoc (~> 4.0)
     sourcemap (0.1.1)
     spring (1.3.6)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)

example/sinatra-tutorial/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.25)
-      opal
+    reactive-ruby (0.7.36)
+      opal (= 0.8.0)
       opal-activesupport (>= 0.2.0)
-      opal-browser
+      opal-browser (= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.0.0)
     hike (1.2.3)
     opal (0.8.0)
       hike (~> 1.2)
@@ -22,7 +23,7 @@ GEM
       paggio
     opal-jquery (0.4.0)
       opal (>= 0.7.0, < 0.9.0)
-    paggio (0.2.5)
+    paggio (0.2.6)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack
@@ -31,8 +32,9 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     sourcemap (0.1.1)
-    sprockets (3.3.3)
-      rack (~> 1.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
     tilt (2.0.1)
 
 PLATFORMS