up
up
Merge branch 'master' of http://github.com/da1hk/dotfiles

Conflicts:
	.zshrc.alias