adding .Xresources
Merge branch 'master' of https://github.com/jfun/configs

Conflicts:
	home/.weechat/weechat.conf