branch by branch graphs implemented
fixing conflicts
fixing conflicts
Merge branch 'chartsOptimization'
Merge branch 'master' of https://github.com/patrickdmccarthy/Falcor