Add colors to gitconfig
Merge changes done in another branch by accident