Finish sign in
Finish sign in
Another commit to hopefully fix conflict
Merge branch 'sign-in-out'