Modified: Added path for /usr/local/bin.
Merge branch 'master' of github.com:futoase/dotfiles

Conflicts:
	.config/fish/config.fish
Modified: Update config.fish