update settings
Merge branch 'master' of https://github.com/tytskiy/My-Sublime-Text-3-Packages

Conflicts:
	User/Preferences.sublime-settings
update gitignore