añadimos linea2
Merge branch 'master' of https://github.com/JonRodriguez/prueba

Conflicts:
	famosos.txt