Auswertung Kondensator
Merge branch 'master' of github.com:laochailan/pgp1-ws1415

Conflicts:
	elehre/widerstand/Praktikum.pyc