cambio local
Merge branch 'master' of https://github.com/blackmantram/practica

Conflicts:
	prueba.txt