change gitconfig
mess
Merge branch 'master' of git://github.com/tadelv/dotfiles