gitignore update
update by albert. Merge remote-tracking branch 'upstream/master'