introduccion y conclusion
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/tesis/tesis.docx