Modified tmux
Updated
Merge branch 'master' of github.com:watanabe0621/dotfiles

Conflicts:
	.gitmodules
	.zshrc
	dotfile_list
	tmux-powerline