update
Merge branch 'master' of github.com:jurek7/tmux-config

Conflicts:
	.tmux.conf