Finish user signup
Something else here
Merge branch 'sign-up'