Can I see what I search for, please?
Merge branch 'master' of https://bitbucket.org/muchzill4/setup

Conflicts:
	dotfiles/.config/fish/config.fish
Yes, I have copy-pasted that
Updated colors