Modled basic User Model
Merge branch 'modeling-users'