change sass files to scss files
Merge branch 'JW-working-branch'