brian's canvas changes

they don't work
Merge branch 'master' of github.com:cjwillia/grapher

Conflicts:
	app.js
	static/clientApp.js