Finished the bar and pie charts.
Merge branch 'team1-charts' into team1-dev