Noch toller gemacht.
Merge branch 'team2' into team1

Conflicts:
	tolles.txt
Merge branch 'team1' of github.com:martinei/test into team1