generated users controller
changed style
merged users