Merge pull request #2 from jhonvp/otro_branch

Todo en uno
Merge pull request #3 from jhonvp/Jhon_Branch

Merge pull request #2 from jhonvp/otro_branch