Make a basic User model (including secure passwords)
abc
Merge remote-tracking branch 'origin/master'