Make a basic User model (including secure passwords)
git checkout master
git merge modeling-users
git push