更新文件
add git ignore
Merge remote-tracking branch 'upstream/master'