update
update tmux bind
Merge branch 'master' into centos

Conflicts:
	.zshrc