conf data
unready stuff. but git won't let me commit
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE