Configured SASS so don't alter main.css, instead alter main.scss
Merge branch 'stus_branch'