git aliases lg,tags
Merge branch 'master' of https://github.com/anlutro/dotfiles

Conflicts:
	.gitconfig