lokal ändern
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestGitJ/src/Hallo.java