intermediate step (WIP)
Merge remote-tracking branch 'origin/master'

Conflicts:
	presentation/presentation_stefan.pdf