add tmuxconf
Merge branch 'master' of github.com:jixiuf/dotfiles

Conflicts:
	zshrc