Changes to be committed:
	modified:   03_Zeeman/tex/protokoll.pdf
	modified:   03_Zeeman/tex/protokoll.tex
	modified:   05_ESR/tex/protokoll.pdf

Dims shit repariert von Zeeman
Merge branch 'master' of https://github.com/Solarer/FP2014

Conflicts:
	05_ESR/tex/protokoll.pdf

 All conflicts fixed but you are still merging.

 Changes to be committed:
	deleted:    03_Zeeman/tex/protokoll.pdf
	modified:   04_Dipol/tex/protokoll.pdf
	modified:   04_Dipol/tex/protokoll.tex
	modified:   04_Dipol/tex/protokoll.tex.backup
	modified:   05_ESR/tex/protokoll.tex