SIGN IN SIGN UP

Fixed merge conflicts

D
Darrel committed
2ed81ba01f63ee15e6e7ffa3b9cd29a18c8d9db5