modificando el diagrama
Merge branch 'master' of https://github.com/openjaf/spree_travel_demo

Conflicts:
	project/uml.uxf
el gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
automatic commit to pull changes from github
faltaban un par de cositas aqui
ya pincha el loader
otro loader
automatic commit to pull changes from github
unos ejecutables ahi
Merge branch 'master' of file:///home/pqr/work/jaf/otro_travel/spree_travel_demo

Conflicts:
	Gemfile.lock
	bin/rake
	db/schema.rb