test-commit after merge master and testbranch
test6.txt commit
Merge pull request #2 from SystemFehler/testbranch

Testbranch