update
Merge branch 'master' of https://github.com/frient/htdocs

Conflicts:
	fax/fax.pdf
	meibo/presidents.pdf