Some changes

Add gitconfig. Modify Xresources.
Merge branch 'test'