...
Merge branch 'sebastian'
iAjusteAjuste gitignore
Merge branch 'master' of ssh://spider.querys.cl/var/www/clients/client3/web19 into sebastian
Merge branch 'master' of github.com:SeGonzalezR/melon-ecommerce into sebastian