f
Merge branch 'master' of github.com:slnc/dotfiles

Conflicts:
	.tmux.conf