SIGN IN SIGN UP

Fix merge conflicts

I
Ilango committed
e3b530985530a4389e7dac921e6e951d7eb20a97