merging conflcits
Evolucion arreglada y bug numero 23
lista pedidos confirmados
Merge branch 'master' of https://github.com/santiagopiria/Sultanapp
fix mensajes que no se escondian
Tarea 24
Merge branch 'master' of github.com:santiagopiria/Sultanapp into production