zshrc
alias
Merge branch 'master' of github.com:ibigbug/dotfiles

Conflicts:
	zshrc