.gitignore
merge win xp settings