4 primeros metodos
HAML, y gestion de stock
cambio a haml index de SM
 merge conflict
Probando
fixing schema
Merge branch 'NK'
merging
merge conflict
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
fucking schema
arreglado error
Reserva actualizado
REservas
optimizacion ftp
mf schema