little changes
Merge branch 'master' of https://github.com/DrMaggus/KawaFluss
Merging stuff
Merge branch 'master' of https://github.com/DrMaggus/KawaFluss

Conflicts:
	config.py