agregue //
//++
Merge branch 'master' of https://github.com/stefanoantonel/Informatica

Conflicts:
	InformaticaIndustrial/src/modelo/AgregaRelacion.java
desde consola -a