Merge tag 'bash-prompt' into devel

cfg version 0.01
Merge branch 'master' into devel
Created Xresources
Fluxbox settings
Merge branch 'feature/xresources' into devel