graficas agregadas
Merge branch 'master' of github.com:lealtag/angular-cristo

Conflicts:
	app/index.html
	app/scripts/controllers/main.js
	app/scripts/helpers/vars.js
	app/views/graph.html