fixed.
Merge branch 'master' of github.com:yasuhito/dotfiles

Conflicts:
	home/.tmux.conf