updated gitconfig
Merge branch 'master' of github.com:TylerShaw/dotfiles