Added Sass styles
Merge branch 'develop'