added bla.conf
Merge branch 'master' into Philipp_branch
Merge remote-tracking branch 'origin/Philipp_branch'