4 primeros metodos
HAML, y gestion de stock
cambio a haml index de SM
 merge conflict
Avanzando
Reservas en db
FTP listo
reservas
FTP listo - schema
FTP listo - schema de mierda
Gemfile - better errors
Probando
fixing schema
fix gemfile - better errors
Merge branch 'NK'
merging
merge conflict
fix ftp pedido
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
fucking schema