Un peu de tout...
Merge branch 'master' of github.com:NeferTiyi/EgyptoTexts

Conflicts:
	Barbotin/Louvre_Barbotin_20120203.htx
	Kheops/Grandet/Kheops_Grandet_book.htx
	Naufrage/Naufrage.htx