compiling scss to css and clearing up server.js
trying to fix merge
merge from dev-Jon
merged from dev-Jon
left pane in dashboard done
messages done, dashboard done