scss--lint change NameFormat
Merge remote-tracking branch 'origin/master'