Finish user signup
Merge branch 'signup'