git prompt

Conflicts:
	fish/functions/git_prompt.fish