Added more colors, fixed treemap a bit.

Treemap labels will not show up for y-values <= 0.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sprint3/script/submit.js