windows .gitignore file
using remote .gitignore to solve merge conflict