sublime 设置
Merge branch 'master' of https://github.com/timsims/Sublime-Text-3-Setting

Conflicts:
	Installed Packages/Vintageous.sublime-package