Reverted the models to sync with the tutorial.
Made a basic user model with secure passwords
Merging the user branch with the master branch

commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.