.
basic user model, including password
Merge branch 'modeling-users'