i don't remember what i changed
Merge branch 'cryptoRedo' of https://github.com/leithaus/GLoSEval into cryptoRedo

Conflicts:
	doc/wpes/tocappi.tex