git aliases
Merge branch 'master' of github.com:danmichaelo/dotfiles

Conflicts:
	.bashrc