fix
Merge branch 'master' of github.com:miettal/dotfiles

Conflicts:
	.tmux.conf