first commit
Merge branch 'master' of https://github.com/Daso/UPC-POO-2013-2-M1-E31A