mäh added.
...
Merge remote-tracking branch 'github1/master'

Conflicts:
	src/weiser/HelloTeam.java