Merge branch 'master'
Merge branch 'checkin' of https://github.com/UPC-TP3-2014-2/UPC-TP3.git