Added gitconfig with color settings.
Merge remote branch 'origin/master'