string 1
Merge branch 'master' of
https://github.com/stefanoantonel/InformaticaEclipse.git

Conflicts:
	InformaticaIndustrial/src/modelo/Arbol.java
sdsds
Merge branch 'master' of https://github.com/stefanoantonel/InformaticaEclipse.git