Working on user login
Merge remote-tracking branch 'origin/master'
downloading users.json from DB and logging in working