added graphing
implemented graphing

Conflicts:
	app.py
	js/AppController.js
Merge branch 'master' of https://github.com/jogloran/govhack

Conflicts:
	app.py
	js/AppController.js