Added pie charts.
Merge conflict fixin.