Cambios
 Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final

Conflicts:
	css/componentes.css
	widgets/max/w_1/index.html
	widgets/max/w_6/index.html
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final

Conflicts:
	widgets/max/w_6/index.html