Otro cambio
Merge branch 'master' of https://github.com/sole1000/Taller-de-Git

Conflicts:
	README.md