paso a paso colaborar, pop ups ajax
Arreglos de ayer, antes de publicar el front
Merge branch 'dev' of https://github.com/mixitProyecto/mixit into dev
Merge branch 'dev'