Merge pull request #1 from julian-upc/master

actualitzar
Merge pull request #2 from julian-upc/master

actualitzar
Merge pull request #3 from julian-upc/master

Actualitzar
Merge pull request #4 from julian-upc/master

Actualitzar
Code
Merge pull request #68 from elisabetburjons/master

Code