about
Merge branch 'master' of https://github.com/KlavierCat/tzd

Conflicts:
	htmls/about.html