Rgistrierung funktioniert Joke hinzugefügt
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Datenbank/UserLogin.txt
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'