Prueba conflicto
Merge branch 'master' of https://github.com/turtle-lea/paradigmas-tp1

Conflicts:
	README.md