new .gitconfig
new colors
new gitconfig
Merge remote-tracking branch 'upstream/master'