Merge pull request #37 from rockamorales/master

Modificaciones
Merge pull request #79 from mackk/master

last mod
Merge pull request #80 from schumy21/master

Schumy29Abr
Colecturia
Merge pull request #31 from rockamorales/master

Correccion a la modificacion y eliminacion de la consulta