added gitignore on desktop
Merge branch 'master' of https://github.com/lopoye/git-web1
local commit
Merge branch 'master' of https://github.com/lopoye/git-web1
added win client