Git should ignore windows binaries
Merge remote-tracking branch 'origin/master'