Minimal config
Merge branch 'master' of github.com:serebrov/i3conf

Conflicts:
	autostart