misc
Merge branch 'master' of github.com:NeferTiyi/EgyptoTexts

Conflicts:
	Kheops/Ete2014/Kheops_Grandet_TextesPyramides.htx
	Kheops/Grandet/Kheops_Grandet_Chap7_NE_b.htx