bar graph #138
Merge branch 'bargraph' into dev