nova modificacio a readme desde cnpallares
conflict in README from master
Merge branch 'master' of https://github.com/cnpallares/repositori-prova