added main.scss file
merge fix
Merging ...
merge cleanup
merge fix
merge cleanup
merge fixes on my end ...