added user sessions and login
adjusted some work session stuff
fixed merge conflict
added something
merged and fixed conflicts