Made User model with password
Merge branch 'modeling-users'