adds create action to users controller
merges conflicts