cambios menores|:
Maerge branch 'master' of https://github.com/alejandroPardo/lacloMAG

Conflicts:
	resources/tesis/tesis.docx