alias added
Merge branch 'master' of github.com:zlorfi/dotfiles

Conflicts:
	zsh/lib/aliases.zsh