SIGN IN SIGN UP

resolved merge conflict

T
Tony Tam committed
acd715bdb3c062e81ed4f01382ba70ba5ca2c888