local mfalcon commit
Merge branch 'master' of github.com:voylinux/dotfiles

Conflicts:
	i3/config
i3 commits unified