Pie chart? fixes
Merge branch 'master' of github.com:mwcaisse/webware-final