Merged .gitignore
Windows settings