responsive progress
Merge branch 'master' of github.com:csviz/csviz
merge conflict in build