before monday morning merch
Merge branch 'master' of https://github.com/mw23/st

Conflicts:
	chapters/modulecooling.tex
merge?
montag abend

Signed-off-by: Martin <m@w.fake>