Update gitconfig
Set editor for fish config
Alias git -> g
Merge branch master