got user table and test to be green
add default for admin
gemfile issue
Merge in users