new aliases
Merge branch 'master' of github.com:olethanh/dotydot

Conflicts:
	dot/zshrc