Temporary commit
Merge branch 'linux' of https://github.com/stephen422/dotfiles into linux

Conflicts:
	.xinitrc