Modified User model and created DBcontext for Users
Resolved conflicts with last push