fish key bind
Merge branch 'master' of github.com:toyamarinyon/foundation

Conflicts:
	fish/config.fish