Fix exercici4
Fix exercici4
Merge branch 'master' of https://github.com/albert33/projecte-inicial