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

Conflicts:
	neferlatex/neferhiero.sty
	utils/ChapterStyles.tex
	utils/Hiero.bib
	utils/TitlepageKheops.tex