finished everything before google charts
finish adding boomshakalaka
Merge pull request #1 from brettsanders/master

BOOMSHAKALAKA!!!!