Merge pull request #8 from BielBdeLuna/scripts

de Scripts al Master
Merge pull request #9 from Arnau10/master

mapa de la ciutat
Merge pull request #6 from BielBdeLuna/master

canvis