conection
Merge pull request #23 from UPC-TP3-2014-2/carga

conection