Instantiating a Default-Greeting-Method
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dieterbaier/git/sandbox/Main.java
Neue Begrüßung für weibliche Besucher
Merge branch 'branch1'

Conflicts:
	src/dieterbaier/git/sandbox/greeting/Greeter.java