cleaned up chart code and added colors
Merge branch 'master' of https://github.com/headphonestatic/front-end-

Conflicts:
	dashboard.html