.
Merge branch 'master' of https://github.com/benol/dot-files

Conflicts:
	.tmux.conf