- setup user login/sign up
-update user login/signup
Merge branch 'Kori'
-fixed typo
Merge remote-tracking branch 'origin/master'