add 21
Merge branch 'master' of https://github.com/axnotliztac10/demo

Conflicts:
	app/controllers/cotizaciones/cotizacionesController.js
add new quotes model
Merge branch 'master' of https://github.com/axnotliztac10/demo

Conflicts:
	app/views/cotizaciones/cotizaciones.html