resolved merge conflict with index.js
Merge pull request #31 from rjbernaldo/legit_canvas

resolved merge conflict with index.js
Merge branch 'master' into testing_suite