Does this thing even work?
Merge branch 'master' of github.com:atubbs/dotfiles

Conflicts:
	tmux.conf