Update before merge

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

Conflicts:
	Xresources
	gorc