line endings
Merge branch 'master' of https://github.com/antonioribeiro/sublime-data-packages-user

Conflicts:
	Preferences.sublime-settings