modefied
Merge branch 'lxl'

Conflicts:
	README.md
	index.html
add
Merge branch 'lxl'

Conflicts:
	README.md