SIGN IN SIGN UP

merge updates

B
Brian Curtin committed
97e200864575d86516c4dde3ecf6eedf3d534930