Update react-rails gem & get ready for heroku
Merge branch 'master' of heroku.com:sample-react-rails-app

* 'master' of heroku.com:sample-react-rails-app:
  Update react-rails gem & get ready for heroku

Conflicts:
	Gemfile.lock