Merge branch 'master' of https://github.com/kahiru/configs
D
B
Conflicts:
	home/.i3/config

	modified:   home/.i3/config
Merge branch 'master' of https://github.com/kahiru/configs

Conflicts:
	home/.i3/config