modified html.html
add text
add putStr
add str
Merge remote-tracking branch 'remotes/origin/chseo' into larry

Conflicts:
	h/html.html