Update .xinitrc
Merge branch 'master' of https://github.com/DanielFGray/dotfiles

Conflicts:
	.xinitrc