need diff3 again
Merge branch 'master' of github.com:dbushong/dotfiles

Conflicts:
	dot.gitconfig