units are important
Andere interval
Merge remote-tracking branch 'origin/master' into dev_sibren

Conflicts:
	i3/i3blocks.conf
WHITESPACE
Merge remote-tracking branch 'origin/master' into dev_sibren