auto
Merge branch 'master' of https://github.com/ningzhou/shutils

Conflicts:
	tmux/tmux.conf