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

Conflicts:
	README.md