updated readme
Merge branch 'js_edit'