scatter chart and descriptions
Merge branch 'master' of https://github.com/zhengsun/nortonhackathon

Conflicts:
	templates/dashboard/dashboard.html