modify
Merge branch 'master' of github.com:AlphaTr/sublime-preferences

Conflicts:
	Emmet.sublime-settings