update gitignore
Merge branch 'win_zuffy'