add git global config file
add gitignore global
Merge remote-tracking branch 'origin/git'
Merge remote-tracking branch 'origin/git'