hallo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/StatistikFenster.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/StatistikFenster.java
Merge remote-tracking branch 'origin/master'
hallo
Merge remote-tracking branch 'origin/master'