Make a basic User model (including secure passwords)
Cleaned up merge conflict