prueba.txt
Merge branch 'master' of https://github.com/jjaimez/Proyecto

Conflicts:
	README