wrong commit as well
Merge branch 'master' of github.com:jcordry/dotfiles

* 'master' of github.com:jcordry/dotfiles:
  wrong commit

Conflicts:
	Xresources