SIGN IN SIGN UP

Fix conflicts

Q
qingwei.li committed
e99a7b3d6e0cc93531ca89aea3c4e8e3d2b79d77