Created users login page
Merge conflict