fix gemfile - better errors
Merge branch 'NK'
fix ftp pedido
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
fucking schema
arreglado error
Reserva actualizado
REservas
optimizacion ftp
mf schema
First approach to API connections
reserva update
Merge branch 'Zavala'
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3 into NK
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
metodo reserva
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3 into NK
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
Merge branch 'NK'
modified schema