Branch 2
Merge pull request #1 from Patzylin/dev

Mi primer pull request del dev al master