Make a basic User model (including secure passwords)
Merge branches 'master' and 'modeling-users'