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

Conflicts:
	neferlatex/nefermemoir.sty
	utils/ChapterStyles.tex
misc