scaffolded and updated DB with User model
Merge branch 'release/AddingUser'