Ajuste en componentes.js
Ajuste en componentes.js
Merge de componentes js
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Integracion de widgets
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
ACTUALIZACION DE WIDGETS
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Ajuste en estilos de de widgets
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Actualizacion en recompensas
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final

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

Conflicts:
	widgets/max/w_8/index.html
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final

Conflicts:
	widgets/max/w_8/index.html
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final