update log in stuff
Merge remote-tracking branch 'origin/new-login'