conflicting changes to Linux.txt through win-pc
Merge branch 'master' of https://github.com/FRohde/dd_fr_rep