"add static file"
Merge branch 'master' into phillis

Conflicts:
	app.js
	static/clientApp.js
another merge don't know why
Merge branch 'phillis' of https://github.com/cjwillia/grapher
for some reason the sendfile thing disappeared so I add it again
add stringify to parse savedProject
able to add and find a project
brian canvas changes

they don't work
brian's canvas changes

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

Conflicts:
	app.js
	static/clientApp.js