Merge pull request #1 from jadiosa/master

Merge Diosa-Jennifer
Merge pull request #5 from sebasgalle/master

Actualizacion de proyecto
Merge pull request #6 from sebasgalle/master

Ajustes en la aplicacion
Merge pull request #7 from jenniferperez/master

Merge pull request #1 from jadiosa/master
Merge pull request #2 from jadiosa/master

Merge Diosa-Jennifer
Merge pull request #8 from sebasgalle/master

Actualización de funciones.
Merge pull request #9 from sebasgalle/master

Version 1.0
Merge pull request #10 from jenniferperez/master

Merge pull request #2 from jadiosa/master
Merge pull request #1 from jadiosa/master

Actualizacion de proyecto