Added login function to check username and password
Fixed merge conflicts