16.500 Photoeffekt/daten/daten
	new file:   16.500 Photoeffekt/daten/daten
Merge branch 'master' of https://github.com/Diman1992/Prak1213

Conflicts:
	15.703 Geiger-Mueller/protokoll.tex

	new file:   15.703 Geiger-Mueller/Messwerte.ods
	new file:   15.703 Geiger-Mueller/pics/charakteristik.png
	new file:   15.703 Geiger-Mueller/pics/ladungen.png
	modified:   15.703 Geiger-Mueller/protokoll.tex
	new file:   15.703 Geiger-Mueller/protokoll.tex.orig