segundo commit
Merge branch 'master' of https://github.com/dianam05/repospruebaD

Conflicts:
	prueba.txt