Konflikt local
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spengergasse_POS_13-14/src/Hallo.java