.
Merge remote-tracking branch 'origin/master'
started on intro
.
added makro.tex
.
continued on intro
fixed bib style
.
.
.
.
.
.
.
Merge remote-tracking branch 'origin/master'

Conflicts:
	intro.tex
.
added first gnuplog graph
Merge remote-tracking branch 'origin/master'
bloch siegert