add word to html class
test read local html
Merge branch 'ybw'

Conflicts:
	.classpath

	merge master and ybw branch