added to content by HLRS
Merge remote-tracking branch 'origin/master'

Conflicts:
	paper.tex