Upgrade i3 config file.
Merge branch 'master' of https://github.com/cchalpha/UserConfig

Conflicts:
	home/.i3/config