dificultat
Merge branch 'master' of github.com:SenglarSalvatge/enrut.cat

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