Colors problem prompt

	modified:   Xresources
	modified:   bashrc
	modified:   screenrc
Merge branch 'master' of github.com:rkadeFR/dotbash

Conflicts:
	bashrc

	modified:   bash_aliases
	modified:   bashrc
	modified:   dircolors
	modified:   screenrc
update prompt

	modified:   bashrc