update gitconfig email address
Merge remote-tracking branch 'origin/master'