Hola 2
Merge branch 'master' of https://github.com/jgallud/proyecto1.git

Conflicts:
	Diario de Viaje/richard.txt