Global ignore file
rename gitignore
Merge remote-tracking branch 'upstream/master'