Working on the user login
Merge branch 'master' of https://github.com/amitavroy/infinity