fixes
Merge branch 'master' of https://github.com/yakoval/ht

Conflicts:
	css/main.css