merge with windows workstation
Merge branch 'master' of github.com:silver83/dotfiles

Conflicts:
	.zshrc