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

Conflicts:
	templates/base.html
base
Merge branch 'master' of https://github.com/SenglarSalvatge/enrut.cat