Merge branch 'h3' into h6
NEW: xkippy-xd and restore parcellite
Merge branch 'h6' into h3

Conflicts:
	README.md
	world