synce
Merge branch 'master' of https://github.com/kunl/JS

Conflicts:
	demo.html
del some files
Merge branch 'master' of https://github.com/kunl/JS