gonna conflict
Aka solved Merge remote-tracking branch 'origin/master'

Conflicts:
	chapters/Perspektivering.tex