Making basic user model
Merge branch 'modelling-users'