start of day
made user model with authentications
fixed merge conflicts