ventas vs cantidad de facturas
Merge branch 'master' of github.com:jrosas/angular-new

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/main.js
	app/views/main.html
grafica fail