Added user model
Added user model
Merge branch 'modeling-users'