Renamed .Xdefaults into .Xresources
Merge branch 'master' into monoxide