Make a basic User model
Merge branch 'Modeling_users'