Verificafar equipaje
Merge branch 'checkin' of https://github.com/UPC-TP3-2014-2/UPC-TP3.git
Merge remote-tracking branch 'origin/master' into checkin
Merge pull request #35 from UPC-TP3-2014-2/checkin

Verificar equipaje