updated theme
Merge remote-tracking branch 'cristian/master'

Conflicts:
	themes/gentoo.zsh-theme