SIGN IN SIGN UP

fixed merge issue

T
Tony Tam committed
28d39aec77cc4fa9f795bc218f6129ac985ad1cc