SIGN IN SIGN UP

merge: resolve conflicts with master

M
Mason Daugherty committed
59d144659343e8f3d2e9a7357b8255001874b3d7