tabs
Merge branch 'master' of github.com:homosaur/sublime-3-settings

Conflicts:
	Preferences.sublime-settings