now with check if local setup for zsh theme setting exists
Merge branch 'master' of https://github.com/schuppo/dotfiles

Conflicts:
	zsh/zshrc.symlink