Fixed merge conflict
Merge branch 'master' of github.com:chartist/chartist
Merge commit