First Commit/Created login screen
Fixed merge conflict