sin comentarios
sin comentarios
Merge branch 'master' of https://github.com/sordas/ecgview-manual

Conflicts:
	Capitulos/01Capitulo2.tex