Maqueta de pdf y ptras cosas
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
administración de tarjeta de credito_NIP
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
integracion de simulador
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Consumo Peter
Integracion Consumo
administración de tarjeta de credito_NIP
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
Armado de Saldos y movimientos
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final
sdfghjk
asdasd
Merge branch 'master' of https://github.com/victorjo/santander_Maqueta_final

Conflicts:
	css/bloqueo.css
	img/assets/Exportar.png
	js/componentes.js
	widgets/max/w_15/css/w_15.css
	widgets/max/w_15/index.html
	widgets/max/w_15/js/w_15.js
	widgets/max/w_16/css/w_16.css
	widgets/max/w_16/index.html
	widgets/max/w_16/js/w_16.js
	widgets/max/w_4/index.html