HTML Editor Ready \!
Merge branch 'master' of https://github.com/ciuak/ciuak.github.io

Conflicts:
	pages/tedit.html
HTML Editor: Done\!