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

Carga