updated sass syntax to scss
Merge branch 'JW'