Merge pull request #4 from Arquisoft/master

Cambios de pruebaRama
Merge pull request #6 from Arquisoft/PruebaRama

Merge pull request #4 from Arquisoft/master