Se modifican archivos
Merge branch 'master' of https://github.com/Ruminoxxx/LabGit001

Conflicts:
	Documento de linea Base.txt