Finish login
Merge pull request #1 from helkarakse/develop

Finish login