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

Conflicts:
	posts/templates/posts/novaRuta.html
push pro