Added workspace names
Merge branch 'master' of https://github.com/mannebusk/i3-config
Merge branch 'master' of https://github.com/mannebusk/i3-config

Conflicts:
	.i3/config