Merged the gitconfig from work and from home