Gemas
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3 into martin
Manejo de Stock en /stock_management. Hace get de url y muestra en consola
Management
Merge branches 'master' and 'martin'
merge
Arreglado
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3

Conflicts:
	Gemfile.lock
	db/schema.rb
 ahora funciona
Fixed conflicts
Merge branch 'Zavala'
Dropbox funcionando
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
cambio gemfile
clases client y contact crm
limpiado rutas
delete crm y reserva
Mejorando
Listo
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3