new Config System
Fail Verhalten von Github
Merge
Merge Problems
Merge branch 'master' of https://github.com/EldoranDev/MVerleih

Conflicts:
	config.php