worked on login, added profile
fixed merge conflict