I dunno. Changes, I suppose.
Merge branch 'master' of github.com:edthedev/dotfiles

Conflicts:
	i3/config