add User controller, routes
merge conflict user addition