Modificando Index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Cotizacion/CotConsulta.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Cotizacion/CotConsulta.html