Feature/user model

#2