fg
Merge branch 'master' into ElolawynRama

Conflicts:
	documento/salida/proyecto.pdf
fd