Merge branch 'master' of https://github.com/gibiansky/dotfiles

Conflicts:
	foreign/zsh.config