Coses necessaries per a la segona entrega
Merge branch 'master' of https://github.com/JoRd118/PROP