more
Merge branch 'master' of ssh://github.com/jozef/johnnie-thinker.com

Conflicts:
	src/def/en/Who.pod