konflikt lokal
Merge remote-tracking branch 'origin/master'

Conflicts:
	4bhifs/src/Hallo.java