arreglando el gemfile
Merge branch 'master' of https://github.com/openjaf/spree_travel_tour

Conflicts:
	Gemfile