bar chart progress. Incomplete
resolved small merge conflict btwn my version and Christina's version of index.html