paso4
Merge branch 'master'

Conflicts:
	Informe/main.tex