Line ending false changes (?) from Windows
Merge branch 'master' of github.com:robe070/lansalinux
line ending merge issue?