new fish prompt
Merge branch 'master' of https://github.com/piotrdubiel/dotfiles

Conflicts:
	config.fish