added class user attributes
create controler and view
solve merge conflicts