manual merge PStump
Merge branch 'master' of https://github.com/AndreasFMueller/WrStat

Conflicts:
	skript/erwartung.tex