Sma edit
Gaman
Merge branch 'master' of https://github.com/viktorsmari/i3stuff

Conflicts:
	config
Sma fix
uppfaert