directores
Merge remote-tracking branch 'origin/master'

Conflicts:
	diagrama-directores.pdf