testint henry Linux
Merge branch 'master' of https://github.com/hrenza07/Tesis

Conflicts:
	Capitulo 3 Diagnostico.docx