Make a basic User model (including secure passwords)
Fix conflicts - remember to never use commit --amend ever again