delete merge txtfiles conf
Merge branch 'master' of https://github.com/karo1205/Programmiersprachen