git
Merge branch 'master' of https://github.com/dazuara/ejercicio-conflictos

Conflicts:
	git.md