change push setting in gitconfig
Merge branch 'master' of github.com:sethtrain/dotfiles