Settings
Merge branch 'master' of github.com:mtrenker/sublime-settings

Conflicts:
	Preferences.sublime-settings