Merge branch 'master' of https://github.com/sapameco/Prueba1

Conflicts:
	Menu del dia.txt
eliminado conflicto