Merge branch 'master' of heroku.com:weightondate
Merge branch 'master' of heroku.com:weightondate
add the built graph shit
Merge branch 'master' of heroku.com:weightondate

Conflicts:
	public/index.html