Merge branch 'master' of https://github.com/lino-lemmer/physik521-05
Biblatextex dazu
Mehr Inhalte
Ignore all other files
Merge remote-tracking branch 'martin/master'

Conflicts:
	header.tex
	physik521-05.tex