fix text2
modify js file
Merge branch 'test' !!!

Conflicts:
	index.html