Make a basic User model (including secure passwords)
reabse commit
conflict resolved