build dist/
pull github, delete conflict
edit readme.md
Merge branch 'master' into js