saving before merge from nevil
merged from nev
login view almost done, a little done with dashboard view, a little done with logging in and out via angular and controller
merge conflicts
compiling scss to css and clearing up server.js
more front end, login, dashboard, some others
trying to fix merge
backend for authentication done