mv scss files out of docroot, rm generated .css files out of repo
add scss files to src, ignore css dir because it should only contain generated files
Merge branch 'conflict-avoidance'