modified:   11.304 Magnetisches Moment/protokoll.pdf
	modified:   11.304 Magnetisches Moment/protokoll.tex
Merge branch 'master' of https://github.com/Diman1992/Prak1213

Conflicts:
	11.304 Magnetisches Moment/protokoll.tex

	modified:   11.304 Magnetisches Moment/protokoll.tex
	new file:   12.408 Geometrische Optik/longheader.tex
	new file:   12.408 Geometrische Optik/pics/408a.png
	new file:   12.408 Geometrische Optik/pics/408b.png
	new file:   12.408 Geometrische Optik/protokoll.pdf
	new file:   12.408 Geometrische Optik/protokoll.tex
	modified:   11.304 Magnetisches Moment/protokoll.tex