Bearbeitung

- Bearbeitung vom Menü
Merge remote-tracking branch 'origin/master'

Conflicts:
	gui.py
Merge branch 'master' of https://github.com/Zwelf/Rena