Corrijo la cabecera
Merge branch 'develop'

Conflicts:
	images/header-bg.jpg