Adding User object
adding passwords to basic User model
Merge branch 'modeling-users'