cambios olvidados
Merge branch 'master' of https://github.com/handru/tesis

Conflicts:
	Nota-avance-extension.odt
borrado notas extension.