Fixed merge conflict in barGraph.html
Merge branch 'master' of https://github.com/nikhilNathwani/datavis