equip, creacio de explicacio de qui som
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/parts/base.html