moving charts.js
Merge branch 'master' of github.com:davidandrus/code_sample