"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