something changed...?
testing...?
.gitconfig:wrote editor,color
changed git editor from emacs to nano
Merge branch 'master' of github.com:kakakaya/dotfiles