M�s Cambios
pais de la piruleta
Merge branch 'master' of https://github.com/SenglarSalvatge/enrut.cat

Conflicts:
	posts/templates/posts/filtreDeRutes.html
	posts/templates/posts/mostrarRutes.html