SIGN IN SIGN UP

merge fix

C
Cristhian Zanforlin Lousa committed
fbc9eb6d1bf24e105149b561d9de2fa159232c4d