Make a basic User model (including secure passwords)
xx
Merge branch 'modeling-users'