removed merge conflict
windows-guide updated by roger
 Please enter the commit message for yur changes. Lines starting