Regular login
Merge pull request #27 from SamLau95/regular-login

Regular login