Make User model
update user.rb
Merge branch 'modeling-users'