Finish user signup
Merge branches 'master' and 'sign-up'
Sign up