Merge branch 'master' of https://github.com/mmontes11/charts-js
Merge branch 'master' of https://github.com/mmontes11/charts-js