aufgabe 4 fertig
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	NMR/main.aux
	NMR/main.log
	NMR/main.pdf
	NMR/main.synctex.gz