fix; .tmx.conf, .zshrc
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
fix .tmux.conf
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
Merge branch 'master' of https://github.com/manaten/dotfiles
† fix .gitconfig †
Merge branch 'master' of https://github.com/manaten/dotfiles

Conflicts:
	.gitconfig