Merge branch 'master' of https://github.com/atorrano/M.T.-report

Conflicts:
	XR_summary.odt
	esquema.aux
	esquema.log
	esquema.pdf
	esquema.tex.backup
	esquema.tex~
	esquema.toc
Merge branch 'master' of https://github.com/atorrano/M.T.-report