Merge branch 'gh-pages' of github.com:hepeguo/hepeguo to master

Conflicts:
	README.md
updat readme
merge master
add file drop and web worker