replaced git lol alias with a prettier git l alias
Merge branch 'master' of github.com:mrkipling/dotfiles

Conflicts:
	.gitconfig