origin
Merge remote-tracking branch 'origin/master'

Conflicts:
	InformaticaIndustrial/src/modelo/Arbol.java