git log alias
Merge branch 'master' of github:jedemenge-it/dotfiles

Conflicts:
	.bash_aliases