Conflicto en master
Aviso Legal
CAMBIO TEXTOS
Generando conflicto en v1.1
Merge branch 'Version1.1' of https://github.com/daralu/cursogit into Version1.1