Make a basic User model
Merge branch 'modelling-users'