Hi :)
Merge branch 'master' of https://github.com/drlh/fallstudie_test.git

Conflicts:
	ebbelwoi/src/test/Test.java