update git ignore
Merge remote-tracking branch 'origin/fileTransfer' into fileTransfer
.gitignore