Merge branch 'master' of https://github.com/tigerente/CI_Uebung

Conflicts:
	Blatt01/1_2/calculateTrafos.asv
	Blatt01/1_2/getRepresentative.m
ok
Merge branch 'master' of https://github.com/tigerente/CI_Uebung

Conflicts:
	Blatt01/1_2/getRepresentative.m