del
Merge branch 'master' of git@github.com:gerduwemueller/training.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	Training/src/java/de/muellerbensheim/hallowelt/NochEinHallo.java