make aliases
Merge branch 'master' of github.com:codementum/dotfiles
update
Merge branch 'master' of github.com:codementum/dotfiles

Conflicts:
	zshrc