new changes
new changes
Make a basic User model (including secure passwords)
merge error corrected
revised