Removed whitespace
Merge remote-tracking branch 'origin/dev_sibren'

Conflicts:
	i3/config