wo conf
Merge branch 'master' of https://github.com/stefanoantonel/Unido.git

Conflicts:
	InformaticaIndustrial/src/modelo/Arbol.java