commit
Merge branch 'master' of https://github.com/lootwph/dotfiles

Conflicts:
	i3/config