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

Conflicts:
	Installed Packages/AdvancedNewFile.sublime-package
	Installed Packages/CTags.sublime-package
	Installed Packages/DocBlockr.sublime-package
	Installed Packages/Vintageous.sublime-package
	Packages/User/Package Control.sublime-settings