Update
Merge branch 'master' of github.com:zellux/dotfiles

Conflicts:
	zshrc.symlink
Update