fixing scss-lint config
Merge branch 'dev' into uconn-1
Merge branch 'uconn-1' into UC-93