Test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	CentralAbastos/src/co/edu/uniandes/centralAbastos/dao/DAOPedidosEfectivos.java
sisisisi
Merge branch 'master' of https://github.com/camiloforero/SisTrans.git