resolved merge conflict with index.js

Added in MVP of canvas charts