ultimos tratos en proceso
Merge branch 'Develop' of https://github.com/jhoelmg/TerceraPrograBD into Develop

Conflicts:
	SistemaIntercambio/src/Clases/Trato.java
Merge branch 'Develop' of https://github.com/jhoelmg/TerceraPrograBD into Develop
Ultimos Tratos finalizado
Merge branch 'Develop' of https://github.com/jhoelmg/TerceraPrograBD into Develop
TODO LO DE PARTICIPANTE