more def
Merge branch 'master' of ssh://github.com/jozef/mr-cynical.com

Conflicts:
	src/def/en/M.pod