merge
merge fix
charts and charts and charts
merge fix
pie graph and histogram
merge fix, new graph types