set tmux default shell to zsh
Merge branch 'master' of https://github.com/giga811/myconf

Conflicts:
	tmux/.tmux.conf