dr house ramirez
cositas
Merge branch 'master' of https://github.com/SenglarSalvatge/enrut.cat

Conflicts:
	dposts/templates/posts/filtreDeRutes.html
	templates/index.html