fix gemfile - better errors
Merge branch 'NK'
fix ftp pedido
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3
fucking schema