poner el Redme de la rama 1 respecto al master
Merge remote-tracking branch 'origin/rama1' into rama2
Merge pull request #1 from Zange/rama2

Rama2