login is completed successfully
merged conflicts after login created
Merge branch 'master' of https://github.com/cprasenj/ADDA
Login is completed