add screenshot
del conflict file
update setup.sh
update readme
add updatelog and tips
add a tip
rm pyc file
update setup.sh
add javascript plugin
fix javascript indent bug
Merge pull request #2 from ma6174/master

update