correcion_error
Merge branch 'master' of github.com:valerialovaisa/tesis_latex

Conflicts:
	capitulo_9.tex