Converting css to scss
Merge branch 'master' of github.com:SmallsLIVE/smallslive

Conflicts:
	smallslive/static/css/application.css