13123
add html

works
Merge branch 'wrk' of github.com:zldrq/ContentEditor into home

Conflicts:
	todo.txt