finale abgabe
changed properties reader
init lab3
lab3 - start part1
fix
Merge remote-tracking branch 'origin/master' into Dani

Conflicts:
	build.xml