AFM: Artifakte
Merge branch 'origin/master'

Conflicts:
	AFM/main.tex