added .vcxproj.user to gitignore
Merge branch 'master' into windows
Fix file write issue
Merge branch 'windows'