add User controller, routes
merge conflict user addition
user show page
name user to users
All basic specs for product model written and passing
fixed merge conflict