updated rails and ruby
Merge branch 'upgrade-rspec'
conflicts

Conflicts:
	Gemfile
	Gemfile.lock
	spec/features/home_feature_spec.rb