Merge branch 'master' of github.com:extermistmonk/dotfiles

Conflicts:
	.i3/config
Merge branch 'master' of github.com:extermistmonk/dotfiles